am b69dd181: Merge "Add missing unregistrations when a connection ends." into mnc-dev

* commit 'b69dd181d058b6a977d46bea8d2b696650031c5e':
  Add missing unregistrations when a connection ends.