Merge "Fix SensorNativeTest"