Merge "Track (non-public) API change in String"
am: be9a83e480

Change-Id: I39e5d21a51d048611af0ab05d8454bf7b9f6dfbe