am 8672f044: (-s ours) am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '8672f044ffba414c6caade21cff8b55a707713f0':
  Import translations. DO NOT MERGE