Merge "Rename Sensors 2.0 Default Implementation"