Merge changes from topic "am-e1db3a86f52d480885622c9b4069859e" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 733881a9 -s ours am: e744d500 -s ours am: aac6bbf6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 744cf122 -s ours am: bee8b97c -s ours am: 2c9b40d1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6ddfcdd1 -s ours am: 4b6a55aa -s ours am: ab0a9746 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afc7d6fd -s ours am: 1f70cb45 -s ours am: e40e1c4e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a68ca534 -s ours am: f99a45c8 -s ours am: 7fc6ec14 -s ours