am d1c36cff: (-s ours) am 3b17c7f3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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