Merge "Fix ClassCastException for ImsExternalConnection"