am 81fc17b0: am 9d4c0d42: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '81fc17b0e759434a7a0dd595af67037da165bf57':
  Import translations. DO NOT MERGE