am 0505b8bf: (-s ours) am 17936f01: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '0505b8bfab86ce53212e9402e55da4dc243e6d4b':
  Import translations. DO NOT MERGE