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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0b927d3b -s ours am: d073eba8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a6b00b6 -s ours am: add2b3c0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: aa1ad991 -s ours am: 56a9a204 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5ccfc6b -s ours am: bfdd8cf2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5f862fe8 -s ours am: 5c5e2b6a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9dde3dc7 -s ours am: aebabb0f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9758e7ec -s ours am: 78af6020 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad758437 -s ours am: f4b40f60 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 92023faf -s ours am: 086ed77a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90233045 -s ours am: a783a681 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25e12b1e -s ours am: 4d5b32df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f961ac7c -s ours am: 4d771e62 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d5a13d96 -s ours am: ede2af5d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f26c5391 -s ours am: be164ca6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7eb52a20 -s ours am: 9e2801d8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc5992c -s ours am: 7a829219 -s ours