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

* commit '0829e9228aef2e01346a52a8ffc0a983b833f8c4':
  Fix potential ClassCastException.