am 6a35388b: (-s ours) am c08e11a1: am 541b9945: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '6a35388bad75502903f82c97ba8eb65cfe3fcf22': Import translations. DO NOT MERGEmain
commit
24663a0f72
* commit '6a35388bad75502903f82c97ba8eb65cfe3fcf22': Import translations. DO NOT MERGEmain