am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '47417ec155c38140df51ddea7afd01174e37cea3':
  Import translations. DO NOT MERGE