am b83b6f93: (-s ours) am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b83b6f932c751c0b68f4958e5f6afb76bf7c4540':
This commit is contained in: