Merge changes from topic "am-77a42f00787b410faef13ebe05aa4b9d" into udc-qpr-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb393ff9 -s ours am: 3882134c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e8c53 -s ours am: f1fdc08a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7503f46d -s ours am: 2d718e67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83f0b704 -s ours am: f199e2b3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 876a5062 -s ours am: 8fe288a5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4fcff4b -s ours am: cca1430f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 865ac3bc -s ours am: 73554b71 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89812a9a -s ours am: 62f3233b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 49dd4d9c -s ours am: a32eb0be -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60d4b310 -s ours am: ced0d328 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cd165803 -s ours am: dd8f72c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a0b8783 -s ours am: cc7d4ac6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 521ee620 -s ours am: 2bbd9c4e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9ce1b741 -s ours am: 002038d7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 955ceede -s ours am: 45d5b106 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7eba5df -s ours am: d542e949 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f7ba222 -s ours am: 650cf48c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a060f68 -s ours am: d75c098a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 27c407e2 -s ours am: 5fbf56e4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bdac1455 -s ours am: 55119f77 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1d56d3e4 -s ours am: 1c80fb3c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1a2ad77 -s ours am: 0b36f168 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 883cb3f0 -s ours am: e81961e7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40906275 -s ours am: 21d544ad -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 770a6590 -s ours am: 780ca195 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6622461 -s ours am: 07896e5b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 39c1deba -s ours am: 18d10c90 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9e05b48 -s ours am: 83ed1b1e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e03de698 -s ours am: af22581c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 914f58f3 -s ours am: e00643a6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fdf5b94e -s ours am: 545b5bb3 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f9747a4 -s ours am: 8cbac518 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f590909f -s ours am: 54b1b9d4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5d3a9c -s ours am: 18fa7737 -s ours