am beb720db: am 47c66ed1: am c2c2b63a: am a84d34e8: am 32ddc833: Merge "Protect against class cast exception" into klp-dev

* commit 'beb720db32e1c6b26e3fa3001dc25352ad564f17':
  Protect against class cast exception