Merge "Fix build with sensor.h"