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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 56eb9d07 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1dd938f2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d826a92d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b54527da -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 71c52db3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bf2bb91 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c49f8a79 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14ff451c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 045aa972 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00fe6a74 -s ours