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

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