Merge "init: cleanup some string usage" am: 84c2eebbdd am: 77382acf42 am: 288fb7c2cc
am: 1a23b2aef5

Change-Id: I4cbf4f73cc3d58c0f1f7fb464f0919fe05f6b58d