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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fcb3254b -s ours am: 3f0480f3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85d14b40 -s ours am: b0a4be52 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3ab19574 -s ours am: 3fe78c58 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3b70d85 -s ours am: cc2d633e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 23a7c6e6 -s ours am: b0869f28 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08879ae1 -s ours am: 97d198d5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d0581190 -s ours am: be9feffb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7037caee -s ours am: 3256d2cc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8c250257 -s ours am: 736a75a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37109047 -s ours am: a37a577e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0bb878f7 -s ours am: a1012b02 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 051a286a -s ours am: 24f36d2c -s ours