am 8330dac1: resolved conflicts for merge of 389b56b3 to mnc-dr-dev

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