Merge "Default flush implementation for Sensors 2.0"