Merge "SensorService performance improvements." into lmp-dev