am 2cdc5c37: (-s ours) am cb21c8cc: am 2c2b232b: am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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