Merge changes from topic "am-142d4f4f2407456e9aabb5f97eb0e9ca" into udc-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0f12f4ad -s ours am: 196f16b2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187b8bb5 -s ours am: 26d34fcb -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 012aee5e -s ours am: 5105317a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d767975f -s ours am: 567f5271 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b3ff2f8c -s ours am: c0fa701f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbf99c82 -s ours am: 9ed4db6d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9c7cd168 -s ours am: b7f56726 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad7548f9 -s ours am: 207c0a77 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 54d52651 -s ours am: bfb82991 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adbd8f48 -s ours am: 4bb67401 -s ours