Merge changes from topic "am-b5c99e68d6324fec9bfdd30d69903bc0"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2ec7a789 -s ours am: 4d9c68f4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6caccefb -s ours am: 229f239b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d5f4225d -s ours am: 936a1d19 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 005a728d -s ours am: 8933f9ef -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b1508d6f -s ours am: 94c263cc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e41a16d0 -s ours am: d166c92e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d9405886 -s ours am: 20de571d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47409a4e -s ours am: cb3f6729 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b0fccae5 -s ours am: 9dabf844 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a22239e -s ours am: 1e1c1961 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9bb0c00a -s ours am: 3f9d27c6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e65939f4 -s ours am: 7ca27c38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b52a7d92 -s ours am: 38ff702f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ba35fd6 -s ours am: 5f7bedac -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d243163 -s ours am: b4aa81b7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d12d06c9 -s ours am: 36063f46 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 14d347ac -s ours am: 02715884 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bcf1779a -s ours am: 280b47b8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b67b3d31 -s ours am: 1c16d3a8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc89fbb2 -s ours am: d6b3d62a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 613ccc20 -s ours am: fa172dd5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 056a6d9a -s ours am: 23deaef6 -s ours