Merge "Fix incorrect Android-changed markers in String.java." am: 8100d039 am: b38bb681 am: ff95a571 am: e04ebacf Change-Id: I20ceb56c6ea1d4219896705c8bdf58b215d71a3e