am a6b3ac72: (-s ours) am 38af8108: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a6b3ac72778d3e31d2b297dedfa94799e389d7b3':
  Import translations. DO NOT MERGE