Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev