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

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