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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1a007003 -s ours am: a0d22074 -s ours am: 87dea483 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e98b7d2 -s ours am: 9e4079d2 -s ours am: 909f42ff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bde2b964 -s ours am: 37a4cacc -s ours am: d997ec27 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3983032d -s ours am: 098ec9eb -s ours am: e10c0ca6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d8efd5e -s ours am: a151d777 -s ours am: 05f88cdc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 954bd171 -s ours am: 7a84f687 -s ours am: 242e17d5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a4c401af -s ours am: c6979a4d -s ours am: a2c586a3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45e7c448 -s ours am: b60d0786 -s ours am: c9a5c0cd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1fc95fcd -s ours am: c66a4732 -s ours am: df0d2222 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6496ea2e -s ours am: 68dfa1d5 -s ours am: da6b69a2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 563d0920 -s ours am: 3d1dbf99 -s ours am: b40b5155 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4324e69 -s ours am: b20dc9c4 -s ours am: 21c872a4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7bd94ae8 -s ours am: 9e56152a -s ours am: 32d0795e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba72995f -s ours am: e3052d25 -s ours am: 59a0a45b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: abbbc229 -s ours am: ea9d2452 -s ours am: a46f222c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6b9b6d8 -s ours am: 1974d3d7 -s ours am: f25bc49b -s ours