am 9772d50f: am d6f8ba55: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '9772d50f83a35f2a5f0bdb884b298bbeea1d7d29':
  Import translations. DO NOT MERGE