Merge "Fix a few known issues in SensorService" into nyc-dev