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

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