am c0064a26: am 43c19cb1: am bf12d55b: resolved conflicts for merge of b69dd181 to mnc-dr-dev

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