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

* commit '46a74a96f85148135ebc56800aa4da209c270943':
  Revert "Add missing unregistrations when a connection ends."