Merge changes from topic "am-0044f066ae544b2db72e3759316cdaf7" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0e7e53e8 -s ours am: d2a0fab0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1efe0b4 -s ours am: ff5282b0 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 226302d0 -s ours am: 06f2d4e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9783f09 -s ours am: 31d6ccbe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1f7457e -s ours am: ea10b5ba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5896afd -s ours am: c55d9a38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d2a0a8d3 -s ours am: 0de66816 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99938cce -s ours am: ff7a1a3a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9292a63f -s ours am: 957283c4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4991792e -s ours am: 0c4e2734 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c98d4d7 -s ours am: 2e5ff0e5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f6c0699 -s ours am: 715f787c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0a3e2c80 -s ours am: 3dc8ae99 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fc5f8b1 -s ours am: 54712f95 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e034ac71 -s ours am: 52210362 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4c343e3 -s ours am: 5dd9f762 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb62b748 -s ours am: 0ddc1e2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e1e099e -s ours am: d1771647 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f9238c40 -s ours am: 5e4a37ac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f644931c -s ours am: cab17780 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1e599a6 -s ours am: e3775763 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74518b5f -s ours am: 8dc6048c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3980123b -s ours am: 4d1bd460 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29685d41 -s ours am: 2a7bb116 -s ours