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

Change-Id: I412eac20be34ec0f36b5025160ffebb7aeec824b