Merge "Add missing sensors to Sensors 2.0"