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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f9488686 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 98aafb20 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 209ec03e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3e87c7a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2095e14b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9872f3f3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b49177c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a24d779a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74c90e1f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e0ed756 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 956a1710 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b606d01 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11862c7b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8987b220 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74cd47bc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 94f715c2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: cda97418 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f7141fd5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa9d09a4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c858aea -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e195a360 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec046d55 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8c13c9e5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3d7cbec -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a628c0e8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783e70ef -s ours