Merge changes from topic "am-2d1b6dd6d2ae4aa188d748f3cbc61a70"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 56608628 -s ours am: fe4ceac8 -s ours am: 8a7ccdac -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d542620 -s ours am: 03251d4d -s ours am: 25cfec6f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6c04c1af -s ours am: 6a5adf33 -s ours am: 3a84c0f5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbdf623b -s ours am: ccd2df51 -s ours am: a0979ba9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1ea6cd55 -s ours am: 1f4bc7eb -s ours am: 70661e0b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 46eee483 -s ours am: 98e6a0b6 -s ours am: a369ed96 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ae889203 -s ours am: 0b484257 -s ours am: b37f5435 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8085c674 -s ours am: be02723f -s ours am: d6f085a2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 4f71d23d -s ours am: 02fdb52f -s ours am: 905b6c6f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0057e7b9 -s ours am: 83354524 -s ours am: 3b649faa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: b4906119 -s ours am: 97ba4e97 -s ours am: 309589c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e8bd389c -s ours am: 0d906bd5 -s ours am: a8fcaba4 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 37f514ce -s ours am: f85eb28c -s ours am: c1a04ce5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bcd52c7d -s ours am: e1c810d4 -s ours am: 89199f10 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1b7da594 -s ours am: e2bffc86 -s ours am: a6caee05 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51ae57ba -s ours am: 2674641c -s ours am: 46c6a619 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1038acf7 -s ours am: 4f077c76 -s ours am: 354ecfe7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65b8a7ff -s ours am: fe535945 -s ours am: fbeb864a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 65a665ba -s ours am: 14e25d20 -s ours am: 608fcaef -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3316a74 -s ours am: c9c9c073 -s ours am: 9340da52 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ab265b2e -s ours am: 76718143 -s ours am: ec78156a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61abb96d -s ours am: 05cddb70 -s ours am: 7e7aa005 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 99b105f5 -s ours am: c8a378fe -s ours am: fa3bd337 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f79d473 -s ours am: ceb5ce50 -s ours am: c05209ff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c96eb1bc -s ours am: 7a146f4b -s ours am: 0fbd4584 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ad8a405 -s ours am: 725395ec -s ours am: f769c4e3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3dbb8d32 -s ours am: e26197a5 -s ours am: 407f7624 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4b2f2139 -s ours am: 482b647b -s ours am: 46d13392 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3930f403 -s ours am: 61c4bbea -s ours am: 6d800d41 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52268b6a -s ours am: 0ae292ae -s ours am: 3fe1d0ed -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a2ad826b -s ours am: 206f12de -s ours am: 5d43fb8b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2a95d8be -s ours am: 8ea0a52c -s ours am: e26af9d3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: ef8b8ef9 -s ours am: 1fc664c9 -s ours am: cc0b3728 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4658d0fa -s ours am: 5ea0c1ef -s ours am: 7c8a2cd7 -s ours