am 3a7736e5: am a04b4f8d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3a7736e516b3b553717986d6fc5b988e1fd3c6ee':
  Import translations. DO NOT MERGE