Merge changes from topic "am-20e760ad0328438c89fbeb70d36bb8f3"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1e039379 -s ours am: 9ffe8069 -s ours am: ac77b949 -s ours am: becb0170 -s ours am: 617a3593 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1501777d -s ours am: dd67d717 -s ours am: 1b8752e1 -s ours am: 8244eca8 -s ours am: 2ebb60db -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a77af6da -s ours am: 434ac29c -s ours am: 2bb99d84 -s ours am: 6bb6b3ff -s ours am: 01ac81f2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e8279ea2 -s ours am: c0c193d3 -s ours am: 25bf8e8b -s ours am: d1b41089 -s ours am: f6511d5d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fbafc1c9 -s ours am: 051a7dc9 -s ours am: aaacb2bb -s ours am: 605a8d46 -s ours am: ba838214 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba9ce4a -s ours am: a03a3af5 -s ours am: 71a0d65c -s ours am: 1a70d48d -s ours am: ae687225 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b303dac1 -s ours am: 9f53f17e -s ours am: 0cb822b3 -s ours am: 657c5369 -s ours am: 021e0db7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a048294e -s ours am: ac8e9903 -s ours am: 3779b33c -s ours am: 8e620248 -s ours am: efdb3a96 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eed8a616 -s ours am: 8ad8059c -s ours am: e381ac4e -s ours am: ac0eb2c6 -s ours am: 25c47981 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 428587ba -s ours am: cc271156 -s ours am: 86a7b0eb -s ours am: 4d481a72 -s ours am: 03147709 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a419fc3b -s ours am: 7f6165df -s ours am: b529a9b3 -s ours am: 7564b3d5 -s ours am: af9d569c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f214663 -s ours am: b0813a2f -s ours am: 65e99d6f -s ours am: d68c182a -s ours am: bd0f98d1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0f030c79 -s ours am: e66c9cf1 -s ours am: a2f05ca6 -s ours am: d39f297b -s ours am: f08c3bee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0950bd46 -s ours am: fad5e305 -s ours am: 51627a51 -s ours am: 01dc726c -s ours am: 6f486d6d -s ours