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

* commit 'bd403df49693fe08267a90c8abf0396dfab2c4bf':
  Fix potential ClassCastException.