am 62b34cf6: am 62e6d01e: am 1acde1d5: am 8330dac1: resolved conflicts for merge of 389b56b3 to mnc-dr-dev

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