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

Change-Id: I1a1fb0926b3dcadb08901b241be71aa7d26951a7