am 2d962955: am a7acb166: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2d9629557dab78d174cbe1d6d392f7d1735ace25':
  Import translations. DO NOT MERGE