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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4896c61a -s ours am: eb609fc3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28b11a24 -s ours am: c146bb2f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 6f772054 -s ours am: af704f63 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ca56a47 -s ours am: 2f7c20df -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: aa6cc323 -s ours am: cdd565fb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8663454b -s ours am: 70bbaf58 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c6807425 -s ours am: 42b948fb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81809133 -s ours am: 420c75b7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a47ee6b0 -s ours am: 385d5f8c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a90fb331 -s ours am: d91e9d1f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c7c272e -s ours am: 2437dc2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a026dc3 -s ours am: 0b90d880 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7fa5fd30 -s ours am: 8f8bd4d6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e758a294 -s ours am: e6c58d2d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e9b089e2 -s ours am: 26ff9486 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 238dfb5f -s ours am: 45e821a6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d618267 -s ours am: 25951a91 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d7453cc -s ours am: 14477c16 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: afa2346b -s ours am: 36c1da7b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: caf7b1a2 -s ours am: 743137ba -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3df6aa72 -s ours am: 1f080fdf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a838cda1 -s ours am: 7cd8f5df -s ours