Merge changes from topic "am-b175344327f54d5a90a27c62ada4d00c"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 322246e5 -s ours am: 664ecdf9 -s ours am: 10ac2a4d -s ours am: 1536268d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5088189 -s ours am: 8ba61926 -s ours am: 6efd07c0 -s ours am: 979053b9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55d1967a -s ours am: 7940ed38 -s ours am: f277e685 -s ours am: 3a2de9e6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f559752b -s ours am: 7ccec337 -s ours am: 1e57d08f -s ours am: 4f4f25ee -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 609b34c6 -s ours am: 6ae994ec -s ours am: f6f9b6a4 -s ours am: d720d8bb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47656d82 -s ours am: 35fa27d1 -s ours am: 2869a2bd -s ours am: 1e9c24d5 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ca98c6b3 -s ours am: 3bc3d2ba -s ours am: a98ea601 -s ours am: 084a334a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0265f400 -s ours am: fd13b9df -s ours am: 405e3e06 -s ours am: 7cd2463e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4fc4230c -s ours am: 2ba78cea -s ours am: 7a0ab6c7 -s ours am: d93de667 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c903623 -s ours am: 48aee667 -s ours am: ec55cae5 -s ours am: 49e80204 -s ours