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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c5d26a30 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31bae2fb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 91ee06fe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 417a0fbe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b7a2770a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7d9d07e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54106c26 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ef9cc4f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9f37c3f0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d07dcaa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a098f4c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a55b9049 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 153ccc8f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45975e37 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 488b2107 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dab164d5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 12fe5b2f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77517f45 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a949d81 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbd7a9aa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c7221171 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08c0393e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e9baa9d6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac25947d -s ours