Merge "init: cleanup some string usage"
am: 84c2eebbdd

Change-Id: Ic42cb28916c0e8d03db302985f66cb02a801af97