am 2c2b232b: am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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