am c40237b4: Merge "Remove duplicate call disconnect codes."

* commit 'c40237b4831dd9f659691f1f45c4252d97fa51ec':
  Remove duplicate call disconnect codes.