am cb21c8cc: am 2c2b232b: am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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