am 7f907cfd: (-s ours) am 42958b19: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '7f907cfdf84b758dd9f67a4f6279d038a5c876ca':
  Import translations. DO NOT MERGE