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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfa8dea5 -s ours am: 3ed1604c -s ours am: 17f5719d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea0a7f66 -s ours am: ef8525e0 -s ours am: 226a7fde -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e2883a02 -s ours am: a8cd58a0 -s ours am: bbeaff05 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c78a9663 -s ours am: 82d6bdeb -s ours am: 01c62274 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a3a7d9b3 -s ours am: 74d82b04 -s ours am: 782dcd33 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9f39899 -s ours am: 3edbe5c0 -s ours am: 6e7fac1f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d0e648a5 -s ours am: 985d8d84 -s ours am: 9ad0776a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b9c9afe -s ours am: f5e86bdf -s ours am: 35a5954f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb955c5c -s ours am: fb160683 -s ours am: 5293c221 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bcf46f72 -s ours am: 9243e16e -s ours am: a7b650db -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f58e1b64 -s ours am: edae129f -s ours am: 017d82dc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a736890 -s ours am: ee2e2758 -s ours am: b56d3be2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2eeb0e36 -s ours am: f12de68e -s ours am: 17608d0c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5b3d2f1 -s ours am: c4c0d969 -s ours am: e607e9bd -s ours