Handle cleared preresolved strings
am: 77f84fcc25

Change-Id: Ida103e3c4b3abd0cd9bacf07698c9f73fbbbfb10