Merge "Enable resolution of startup const-string for non user builds"
am: 8fdf4e0f5b

Change-Id: Ia82d22d35bbc051fbcddd87bcab88c682c02cbf9