Merge "Revert "hal: Updated DEVICE_IN_PROXY definition""