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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777e -s ours am: 28805c7b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc6 -s ours am: d619e93f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53 -s ours am: d6a9669d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fef -s ours am: 84700228 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc8 -s ours am: 523c98c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c -s ours am: 06744b5e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037b -s ours am: 8a539c86 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775 -s ours am: 4a8934b6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d68 -s ours am: 132852b3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c -s ours am: cc326d28 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158 -s ours am: f96f5a0f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52 -s ours am: 1c03bc8c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a858 -s ours am: 8bdac49b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf -s ours am: 12b09c77 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a98 -s ours am: 3376c696 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d3 -s ours am: c9ab8ce6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a2 -s ours am: c46d796e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a -s ours am: 7dbd5e92 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47 -s ours am: a22942eb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b3 -s ours am: 29c20a8f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf8 -s ours am: b8080004 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea -s ours am: 02577f23 -s ours