am 740afcb6: am f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '740afcb64bb967bb4eada7f7bb071706378d818a':
  Import translations. DO NOT MERGE