am 3ac8060c: (-s ours) am 9e2783ee: am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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