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