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

Change-Id: Ia955033db9a13bd5dfbabfa1af62b95a528dfd7a