Merge "Fix Sensor test fragment" into pi-dev