am 3433b6ff: am 5391a2fc: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3433b6ff3481d2364e8d727e70bb6fdbd3f139c0':
  Import translations. DO NOT MERGE