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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3e866e7e -s ours am: 6e239df7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3cac51 -s ours am: 84d9a6f8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a1dd385e -s ours am: 862c66f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8386276a -s ours am: 25d9f533 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c1875450 -s ours am: 6b21f4c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aa77ca9 -s ours am: e1baf3be -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d7041435 -s ours am: 679c1b3f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8c6a98e -s ours am: f16a090e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9044abbb -s ours am: 5a97db54 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1faccd69 -s ours am: 0ff91770 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 50f86fe2 -s ours am: 57f93cc0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7c89365 -s ours am: 98d7c586 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 000a993b -s ours am: bebdb02b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d7f7df7 -s ours am: 75a71684 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e88f1fa4 -s ours am: 8d16b930 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 282ae827 -s ours am: e398f2d7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b1c81057 -s ours am: 547ad991 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8063f589 -s ours am: 65620b2e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 74f9d50b -s ours am: 49877597 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57565ae1 -s ours am: 1c8e33d1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 180eacef -s ours am: d683995a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9132e4 -s ours am: 56617538 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c1113759 -s ours am: aaef2f53 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57f20b80 -s ours am: e7952a13 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65dfe8b6 -s ours am: d1031ec3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3e960d3 -s ours am: 26fa2684 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dd26475b -s ours am: cc936f81 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ea9231f -s ours am: 968643c7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c6525ba -s ours am: e2aec01c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffea13ab -s ours am: dea49d73 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 49fd9674 -s ours am: 50dcaef0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb792912 -s ours am: a54daf45 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8c1c08f1 -s ours am: 26640bd2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3dcba96f -s ours am: d39b81f2 -s ours