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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 4a83e4212f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: b989753b8f -s ours