Merge changes from topic "am-c25b69b62b1f4669af4171f57f324f73"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6d28a7bd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5bd41a60 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5bd19a61 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e302225 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 96eec627 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 675f5f72 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: dc114919 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aca41bc4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5b0b8132 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c07a256 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 21389912 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 79a7828e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1f83e097 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6673fddb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 81b36729 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa9cba0b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 138e61fd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7769ff53 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d9c8d630 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 01081398 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: db6b7996 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9180b55f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 171721e9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 515f88e1 -s ours