am fe14070c: am 70731879: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'fe14070c9e2f0c25dda83706578d7bfe7e3d8522':
  Import translations. DO NOT MERGE