Merge "A minor followup change for BPF offload device option stuff"