Merge "Remove custome sensors from sensors.h"