Merge "Bug fixes for SensorService" into klp-dev