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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d7f8ceb -s ours am: 3cf5a960 -s ours am: 2188cdc9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee696af9 -s ours am: a2782f82 -s ours am: b0725199 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbbb0e59 -s ours am: 06663a45 -s ours am: 3c51aa8e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47a97c1e -s ours am: a770479f -s ours am: 9522a3ac -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a9d70f2 -s ours am: 35fbc04a -s ours am: 630d6825 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 286b34b1 -s ours am: 46b67efa -s ours am: d6233da0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fe2af5c8 -s ours am: 3ee931ea -s ours am: c443e33b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d3c8cc1 -s ours am: 9e2323e9 -s ours am: 7d8eb97f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d76e95c -s ours am: 2f0e177f -s ours am: ab8d3059 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e09c2462 -s ours am: 8c648192 -s ours am: 5405e8b8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c95f27e3 -s ours am: 348675e8 -s ours am: a2759ca5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 436e4dee -s ours am: d9d1dcdf -s ours am: 1c33c4e7 -s ours