[Sensor] Sync with API7 branch (#1303)