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

* commit '28e26eb38d38c5058006f90d5a22347e6186532e':
  Fix for ClassCastException in SystemSensorManager.