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

Change-Id: I2affbe89bcbb3846a06edee5bc8bd127c8d6b60f