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

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