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

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