Fix possible overrun bug for resolving startup strings am: c2109c6803 am: b927ebdf7d
am: 08baaf2ce3

Change-Id: I7fbc73d5191f85f31469c0b7026df38c6e9af193