am 84b8551a: am e4895175: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '84b8551addebb96e4c13e215b5824e663f23dae6':
  Import translations. DO NOT MERGE