Merge "SensorService flush fixes." into lmp-dev