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

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