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

* commit '17936f0187d4f410a54d32cdc1915e38227d95a0':
  Import translations. DO NOT MERGE