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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 53044cb6 -s ours am: 8dfef1a9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1936ad55 -s ours am: 15263d96 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4eea3945 -s ours am: a8785ad3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d7e03b7 -s ours am: 8aed9b7a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2b62802b -s ours am: 4bc2565e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 279e10cf -s ours am: dd63893e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9507d03b -s ours am: c25bfbe0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa981370 -s ours am: 36aca115 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ad32bdd4 -s ours am: f62f85c0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51d338b8 -s ours am: 58b3d849 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0439c0af -s ours am: 238f1580 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08a4ec82 -s ours am: 713822bd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a1fb463f -s ours am: f8ca0164 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d257773 -s ours am: fd1aab6b -s ours