Merge changes from topic "am-2c1810c1d5a2420fa90feab7f2d15920"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e47bfa19 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b82db97d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: efa53dc8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a22a6440 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5bacf1e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51f104d6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 28186df4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c517b9da -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9ba65f09 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 223fb049 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 67cbe88b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6ca054 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: de275007 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d38984a2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9f29af63 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d644f3a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c6ce05be -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a0878050 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 082cbb9e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36bb8822 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 81ad5f1a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8641cc84 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 589e19bf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba174272 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 4d54baac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a3730e2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 847fa187 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b56abbc8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5a8cd4c1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 94984f50 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fd14f18c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7fcabc0b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 063c6023 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34e3df51 -s ours