Merge "Fix ClassCastException for ImsExternalConnection" am: a8cea75fc3
am: 332ff266ee

Change-Id: Icba41e476f5ea75cdb96456d69e961bca7713ddb