Merge changes from topic "am-d38654e08d584dccab8d45deae120eb0"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 884ee1d9 -s ours am: 714b3f0f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5701b4cb -s ours am: 8a9ab7bc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 10a106e7 -s ours am: df05d723 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 674be0f6 -s ours am: 7e1c57fe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ac98f5d3 -s ours am: 41493c42 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 539d452a -s ours am: 0e6af080 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ad2fff12 -s ours am: 068c6c8d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91c359d8 -s ours am: 915cfd09 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3e23e896 -s ours am: e6ad2db6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8bb26178 -s ours am: 43e80a8c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1affcb52 -s ours am: 88b26102 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9771328 -s ours am: 367ac217 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7499bea3 -s ours am: 2da22950 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 242cf09e -s ours am: e3e8ae1a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 187ebc5e -s ours am: 8768c669 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74471d17 -s ours am: d7634ada -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 796ef7ba -s ours am: bf2c1c57 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bea761f1 -s ours am: dcb66295 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 694a20bd -s ours am: f6548cbd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fa5b64d -s ours am: 7cfeeeaa -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a17978d -s ours am: 7e03cb0b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89cdcc47 -s ours am: 3bbb6248 -s ours