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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66642324 -s ours am: 48e7bd94 -s ours am: 7ff50501 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0e42264 -s ours am: 5a54ca37 -s ours am: e24ff681 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6d58653a -s ours am: c574d470 -s ours am: 7337c911 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5badf4f7 -s ours am: b25465a7 -s ours am: d7eb15e5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a558ca9d -s ours am: 3eaf456f -s ours am: fad2e985 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2562a79f -s ours am: ecbaaae3 -s ours am: 3f13e7f0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 61965220 -s ours am: 0a0c8ac8 -s ours am: 2155766a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b9cfd54 -s ours am: 6cbcb110 -s ours am: 32e359f2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 41469faf -s ours am: 84b113ae -s ours am: e0079d91 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 851980d1 -s ours am: 15561998 -s ours am: 3190a35a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0677e7b3 -s ours am: 2c5ebe1e -s ours am: 0170eb16 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8895076 -s ours am: e6e361ba -s ours am: f1abfc42 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4ed258ba -s ours am: 68dff49d -s ours am: 35b630a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25a7fe4b -s ours am: 4233190a -s ours am: 409cd52f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c0413d0 -s ours am: 8402322e -s ours am: 1fb622ad -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c538cea -s ours am: c9a66eb2 -s ours am: d828e6d5 -s ours