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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: cae92796 -s ours am: a3b85f35 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09bcda20 -s ours am: 756027b7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e90097f8 -s ours am: 8f6b8dcd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cde824a -s ours am: a46de767 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a4d8d0d2 -s ours am: 86f835ab -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30ff2854 -s ours am: afd73a91 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c94a0266 -s ours am: bca4ab0a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8b2b747 -s ours am: 0708818c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f8137fca -s ours am: ae1ddbf0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88624f61 -s ours am: 829ba630 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d8f15e5c -s ours am: 308ee3c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2752f304 -s ours am: 8943f996 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 867cb318 -s ours am: 5307b874 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5ea5e3 -s ours am: 55fae034 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 82f5241a -s ours am: 3ae2e75b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f267fbc7 -s ours am: 7bcb3986 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 45a59933 -s ours am: dd8e4146 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 68e1fe85 -s ours am: 7c661051 -s ours