am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '8b658253361971b920ebc7faaed96dec91dbb731':
  Import translations. DO NOT MERGE