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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7ba24097 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a577fb7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a4a9743f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b08ae27 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: edaa622c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03e17aca -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b8c0735a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3870fbd3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 88dfba3a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4890b595 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b276a264 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c144d13d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e0a0fefc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee471092 -s ours