Merge changes I92be8a46,I7a3b449f

* changes:
  MimeTypes: Change Locale for lowercase from US to ROOT.
  Extract helper methods canonicalize() and allowedInMap().