am 8264bd80: am 36c7d313: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '8264bd80f2f3bcf684176b6945968f978b337680':
  Import translations. DO NOT MERGE