am 6a7813d6: (-s ours) am ec185f4f: Merge "Revert "Add missing unregistrations when a connection ends."" into mnc-dev

* commit '6a7813d64604365a2805714ae53ab6b071f2b0e2':