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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1b91e1fd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcd2a1e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02e7a1de -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7494f557 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 503939df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 06399bcd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 034b72f8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17753e19 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d79cfe27 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fae5e3b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: edb8cda5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b65d841f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 369e9891 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccc780b6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f0b414c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1684e4c2 -s ours