Merging motorola's patch to fix ClassCastException

issue: 15518616
Change-Id: I7d707f12cb20be9aa24d7ea86051f3712b3534af
1 file changed