Merge "Remove commment about java.nio.charset.ModifiedUtf8" am: 95783d06dd am: 5c5d37f63c am: b3d1f35de8
am: 14a754fc8d

Change-Id: I9d2618a935b10768d4287f1a77754893143f7b9d