Merge changes from topic "am-1b29401dfe1f4b059ba177c15ba6faea"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 322246e5 -s ours am: dfe19a50 -s ours am: 5270a32b -s ours am: 2b1ea994 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5088189 -s ours am: becf32a1 -s ours am: f438b57b -s ours am: 4e8b2f6c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 55d1967a -s ours am: a9f5710f -s ours am: 9400f9e5 -s ours am: b90ae23c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f559752b -s ours am: 26444ddc -s ours am: 816e2aed -s ours am: 3d54193e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 609b34c6 -s ours am: b841757c -s ours am: d1ba4cba -s ours am: 6c0a39eb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47656d82 -s ours am: 85c27cd2 -s ours am: 4eba14a6 -s ours am: 3365ddff -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ca98c6b3 -s ours am: 827426c4 -s ours am: ba39b6f4 -s ours am: 1075d178 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0265f400 -s ours am: 71432b63 -s ours am: b3b497e2 -s ours am: 67028700 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4fc4230c -s ours am: 37184594 -s ours am: 490d99e6 -s ours am: 1191c64b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c903623 -s ours am: 0c43d4ac -s ours am: 3d65c8b7 -s ours am: 02d220e2 -s ours