Merge "SensorService fixes." into lmp-dev