Merge "Remove duplicate call disconnect codes."