am 4c059cc6: am 01d9b1f1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '4c059cc6b67a6b2e61a14ba86b2bcec4fa2f821f':
  Import translations. DO NOT MERGE