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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7fa83b4390 -s ours am: 1b1fcabb89 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dc960e79d -s ours am: ec12635539 -s ours