am 11e0c0e6: am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev

* commit '11e0c0e63c70f8bdfb416661a56663a2da426f41':
  Fix for ClassCastException in SystemSensorManager.