am 6078dc9b: (-s ours) am 389b56b3: Merge "Revert "Revert "Add missing unregistrations when a connection ends.""" into mnc-dev

* commit '6078dc9bd2c6f2ce6c5de88ea117b93af2acdf56':