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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: bfc341d0 -s ours am: ed8ed866 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3786e5b6 -s ours am: 84c4da12 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0df5e46a -s ours am: 5a1a338a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1ee72c7e -s ours am: 16897047 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ddce0b8d -s ours am: 9b7fb732 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95f68f94 -s ours am: 8fb2cd0e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 55348e5a -s ours am: 250974bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6f80d59 -s ours am: 776e18c5 -s ours