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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2bcbddd8 -s ours am: ca25fd5d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef0076f8 -s ours am: be20e980 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d4d45631 -s ours am: 35dba853 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dda5100c -s ours am: d5df1378 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d743b0f1 -s ours am: 97ef96e2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8ac5005 -s ours am: e3e0c341 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bcf898f3 -s ours am: 8106742f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b205f86 -s ours am: 4b3cdbe5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0a3e9837 -s ours am: 8fd00961 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe0a2da7 -s ours am: 6ae915e8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4111486d -s ours am: 69ef2510 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17e8325a -s ours am: ad2c8da5 -s ours