am 03368832: resolved conflicts for merge of ec185f4f to mnc-dr-dev

* commit '033688325b49778af4f3ca20cad1309703345be0':
  Revert "Add missing unregistrations when a connection ends."