Merge "Fix ClassCastException for ImsExternalConnection" into pi-dev