Merge "Clean up interface check cast"
am: 8f2af0cab9

Change-Id: Ia24cceb26d6c30abe85832f2e45c5d6a8aa4c755