am c27b2e39: Merge "Make Charsets final."

* commit 'c27b2e39540cabc9218a5f243ee0ce04a1bc7676':
  Make Charsets final.