am 5052bd07: (-s ours) am 587ab417: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5052bd070f92320609ce79207896eb20f1d13027':
  Import translations. DO NOT MERGE