Merge changes from topic "am-46648929b6fc4626bf980cbba5e38c84"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 0bd8ac43 -s ours am: 7d047171 -s ours am: 22918c32 -s ours am: 536de351 -s ours am: fb823e2a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 811c4f98 -s ours am: 96cc305c -s ours am: 9309a3a2 -s ours am: 17f96b81 -s ours am: 85de5902 -s ours