am 38939259: am c3b6ee60: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '389392590178fde1195c2c43f8c540eef5202779':
  Import translations. DO NOT MERGE