am dc8b3b2c: am c6bc27af: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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