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

Change-Id: I21dc83132226c7dcc1e7732214c44f49c97d543d