Avoid resolving startup const strings without a profile
am: 3bfc694a4b

Change-Id: Ib3cddc0000930141b85099f49e8f87283d3071ac