Handle cleared preresolved strings
am: fb5eba3545

Change-Id: Ic98aa255a08193b3918d493dd43c42975a741521