Merge "Fix ClassCastException for ImsExternalConnection" into pi-dev am: 9f2fa00b60
am: 785995ea6f

Change-Id: I7e5b8fdc1984020c4a753f1acc8ece9cb472bf59