am 9e84f8ec: (-s ours) am 1c2fb243: am 8ed48222: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9e84f8ecbc5e9718d8a93f93b9451b7b3d8d2f85':
  Import translations. DO NOT MERGE