Merge "SensorService Flush API bug fix." into klp-dev