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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f151f3c5 -s ours am: 894541f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adf56a96 -s ours am: 37d33eb7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a87bdb75 -s ours am: 00f9b183 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d471bc67 -s ours am: b940dd8e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2580a0e6 -s ours am: 80bc8c8c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b2ad74a -s ours am: 2249a15a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e8dac56b -s ours am: 58c78c87 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3261e0f4 -s ours am: 8b704ec1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cf3b7c84 -s ours am: ac3941f8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1486dda5 -s ours am: 38ce3616 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c56618da -s ours am: 8d5aadd3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385d6d56 -s ours am: 46189723 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 85801b6f -s ours am: 2c685f47 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4c317930 -s ours am: 564b6749 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e36265d -s ours am: 6cc0420b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3042710c -s ours am: 535c8c11 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 013fb5d2 -s ours am: 8aaa29e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e71b7109 -s ours am: 42cd5875 -s ours