am d6f00550: (-s ours) am c2e65ef3: am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'd6f005501b38b437b421df584ee00d9b7bbcb678':
This commit is contained in: