Merge changes from topic "am-e935025ef3084980b813bbb4bc5cdc8d"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 64ad91b3 -s ours am: c28acf13 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b338ca5 -s ours am: 5cd37a09 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b9ca5def -s ours am: 167822df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8aa6b6ae -s ours am: d5705fc1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 790c610e -s ours am: 04c2f5d3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86d273db -s ours am: c5f44f5f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b3a52800 -s ours am: 78d9e12c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edcd330f -s ours am: be2228be -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8ec793a0 -s ours am: 198c3b93 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eeb8882e -s ours am: bed945d1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 040cdcd7 -s ours am: 728c2357 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d943d9ac -s ours am: f16a5bcb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8d443799 -s ours am: 78f0d022 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a4e6600 -s ours am: b005391b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cb6d6ef7 -s ours am: 9d0a6555 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bce19583 -s ours am: 1e47222d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 31f258c7 -s ours am: 232a4fca -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 422e7ffc -s ours am: c8e0cfb8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 97b30b15 -s ours am: 2e493e7d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81de2487 -s ours am: 52f0a4f7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ffb609c0 -s ours am: 031c60c3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0b0ea26 -s ours am: 25be4684 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1bb69ac2 -s ours am: a106edd8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f009e45 -s ours am: f706eccc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ad267ce7 -s ours am: 7d38589d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444d6c49 -s ours am: 6c348aae -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b49c6b35 -s ours am: ca2f64df -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff350a08 -s ours am: 98539d34 -s ours