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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c4370e9a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4743b79e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ad1a607c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4a24c42 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 97f1e418 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f88aef4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f77bba35 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62004c38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fa729599 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8aafd801 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 00f07d72 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4a3bc33 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0fbd48d2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c0e32639 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb25b60f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a3879bf6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d89809ce -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2ad8878 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: da96ad91 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40bb8dce -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 74bc344c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e831b66 -s ours