am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1

* commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2':
  Be careful sharing connections when dun is in play