am a3a2c6a9: am ecc2bcb5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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