Merge changes from topic "am-cec4b7b908aa4897a86dab991d85216b" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a8d81ff3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba28c56 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: bb2d75f6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffa1eccc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 85ae69e8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: feecf549 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c0e811d3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38f94bf4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f2762c2b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2bc6399 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a4d2277f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 645997a9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c27556b3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5af6b557 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 426441ea -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52abe845 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ebc3f10f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af997582 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a24388d1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f74c3151 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 537da3b2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 46878638 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 813cb77b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 932ec79a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ada87bc1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af9cf281 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9a748409 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad02d25d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 1b09bd33 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f3a07dc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a62df309 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d913fb9a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 86961990 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f61306d9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 00d18177 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5c74c7a -s ours