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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfa8dea5 -s ours am: 7a32cf40 -s ours am: 63bbbc68 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea0a7f66 -s ours am: 8224d4f5 -s ours am: 6261ad3d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e2883a02 -s ours am: d0e9e073 -s ours am: 3179dc20 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c78a9663 -s ours am: 1ca6d3a2 -s ours am: 3f690695 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a3a7d9b3 -s ours am: 4d0fb6f6 -s ours am: 47f52a56 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9f39899 -s ours am: 3c71978d -s ours am: a47f7b70 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d0e648a5 -s ours am: 67b3dbff -s ours am: 4e926b7e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b9c9afe -s ours am: 57a8d83a -s ours am: 4bba4497 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb955c5c -s ours am: 29109671 -s ours am: d131b344 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bcf46f72 -s ours am: 2b0e6df9 -s ours am: 13e997d2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f58e1b64 -s ours am: 9c794acf -s ours am: b9073d49 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a736890 -s ours am: 6f8e5f9d -s ours am: 0ebd364a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2eeb0e36 -s ours am: 39cd5b23 -s ours am: f7cc6094 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5b3d2f1 -s ours am: af4d5e7e -s ours am: 3e4a46b3 -s ours