Merge "Remove commment about java.nio.charset.ModifiedUtf8"