am 7c968c29: (-s ours) am b69dd181: Merge "Add missing unregistrations when a connection ends." into mnc-dev

* commit '7c968c2906e623c0f593dfd1bdeea248514c3f1f':