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

* commit '982a4703674ac2cc3a17bc539173f3d237df22f8':