am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '178807d590c1c873bd5eaae4c1cf331549fb6bbf':
  Import translations. DO NOT MERGE