am 72339a62: (-s ours) am c561cc2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '72339a62e13c0d51fbc67e59d28b1e7cff5142d9':
  Import translations. DO NOT MERGE