am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '9508e31dcd41bbdbff255913b72489af95e9bd0c':
  Import translations. DO NOT MERGE