Merge changes from topic "am-0063f4ac8ea9431abbdc1358501d3226"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3344fcc5 -s ours am: 2984e461 -s ours am: 1e88ccda -s ours am: a4d6a07f -s ours am: ffd4f021 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc63b975 -s ours am: 4182c711 -s ours am: 78861eff -s ours am: 4ef21c5f -s ours am: 1371d14a -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7e6fd8a1 -s ours am: 37a63844 -s ours am: f16d4945 -s ours am: de3778af -s ours am: f6b02186 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c94af1f7 -s ours am: e0357ecc -s ours am: ff41f69a -s ours am: eac85f88 -s ours am: 6f710a18 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f34e8105 -s ours am: 92d6f1e2 -s ours am: 381e08f7 -s ours am: 33aae025 -s ours am: 771fe7e7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1c761f6 -s ours am: b0cde9f0 -s ours am: ddd532a3 -s ours am: bafbf5e4 -s ours am: e2e1ec74 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ae3aa3f9 -s ours am: edfec040 -s ours am: 5653d2fe -s ours am: e7aff4df -s ours am: 1e88fab7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7c171b1 -s ours am: abc6399d -s ours am: b79281af -s ours am: eb5f6f1c -s ours am: f8576b39 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 423c0fab -s ours am: 2ce5dbb0 -s ours am: 3cfc00e5 -s ours am: 391effa4 -s ours am: 8811a128 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6b08d11 -s ours am: a2c26280 -s ours am: 61c2b90d -s ours am: b19e30b8 -s ours am: 0b17b652 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1d9c42c0 -s ours am: a7c90155 -s ours am: c727e85e -s ours am: 1489af3a -s ours am: 4910cd6d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 871a5ef6 -s ours am: 9555f6a4 -s ours am: 4955186a -s ours am: b7d9dd20 -s ours am: dad9f8e6 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 26089f0e -s ours am: b9c6e735 -s ours am: aff6d6d8 -s ours am: ae45be36 -s ours am: aa440cb7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1e07b7d -s ours am: 02a7304c -s ours am: f80a8e97 -s ours am: 67763440 -s ours am: 1ab8a2b8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1df82e79 -s ours am: 081becaf -s ours am: 3a7fa8da -s ours am: ff2e1c31 -s ours am: e88888a2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8316e21e -s ours am: 02e97586 -s ours am: cea6dece -s ours am: a923dd87 -s ours am: 36f3b391 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 64e65ae0 -s ours am: 821dfa57 -s ours am: fc978f5c -s ours am: d107ae5a -s ours am: d4f76305 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9eed9cf -s ours am: b921a4d8 -s ours am: 671493e6 -s ours am: 92570ce5 -s ours am: 0a53c805 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 61224af2 -s ours am: 8c1affa8 -s ours am: 2aca4b14 -s ours am: 2cfad7fd -s ours am: 6495cf6f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9447ce01 -s ours am: c85e4fc7 -s ours am: ecf2a2f2 -s ours am: b9b4267e -s ours am: 92e2a46c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c7cb9176 -s ours am: fb35c07d -s ours am: 5c76527e -s ours am: dfc7446f -s ours am: af5e23c5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93196cde -s ours am: 8609e4b6 -s ours am: 0a974e4f -s ours am: 36fcd166 -s ours am: 26042546 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3bbc40cf -s ours am: 3a6befdf -s ours am: d35650f9 -s ours am: 46124153 -s ours am: fd3d0726 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0cce9f70 -s ours am: f07faf99 -s ours am: c37f120c -s ours am: f88d8e8d -s ours am: 0afc7106 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e072e499 -s ours am: 33c1a924 -s ours am: d2064a8c -s ours am: 373c544d -s ours am: 4870de8f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c31e7563 -s ours am: bb372533 -s ours am: 7df1f716 -s ours am: cd4419b4 -s ours am: d6072c41 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 937e6014 -s ours am: aaf44a5c -s ours am: 986ba09a -s ours am: 88a034e3 -s ours am: cd3cef4b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efa7940a -s ours am: 915715d9 -s ours am: 2aa0150c -s ours am: 35693885 -s ours am: c1b2b8ff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b4afd7d3 -s ours am: 9afe4a12 -s ours am: d5cc3791 -s ours am: 275dd21b -s ours am: 95aaac5c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ab3c9286 -s ours am: ac96f7ee -s ours am: 4cfd5f28 -s ours am: 23c5e63b -s ours am: e002321c -s ours