Merge "Fix potential ClassCastException." into mnc-dr1.5-dev am: 0829e9228a
am: 40e3e15bfd

* commit '40e3e15bfd239919bbacd94fb9927fb1269f60c5':
  Fix potential ClassCastException.