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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1e4d3e94 -s ours am: 9dc8bb2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e64c1c0b -s ours am: 1ffe0db3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3bec79b7 -s ours am: f45fe8e1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e72840d7 -s ours am: 82ca65ac -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8b6afb20 -s ours am: b694ee3f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 804c276a -s ours am: d34f2d50 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f986eec2 -s ours am: c3d9ecbc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 389929df -s ours am: 6e90af5c -s ours