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

* commit '754ba8e0a404c58e9ae923a3efc0df806ec221dd':