am f6d4b290: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'f6d4b29088eb9c12f144828f905cee64bd4e0358':
  Import translations. DO NOT MERGE