am aee26e8c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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