Merge "Remove commment about java.nio.charset.ModifiedUtf8"
am: 95783d06dd

Change-Id: I5b9e4158fd6eadbe55243bc9253484b6be202e80