am 9d6cf4e1: (-s ours) am f118bcc5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '9d6cf4e1c3de8415c3c466ac940cafe0d867a4f3':
  Import translations. DO NOT MERGE