Merge changes from topic "all_the_logs" into tm-mainline-prod

* changes:
  [automerge] Cleanup swapped IMS connections. 2p: 6d55213fb3
  Cleanup swapped IMS connections.