ObjPtr<>-ify String allocations, fix stale refs.
am: 179b7c61ea

Change-Id: Ica3e89a3aa36619e761b83af3daed3adde399765