Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 1cc3f4a438 am: c7e9470b06

Change-Id: Ica87ce69526e723f145cd274e081bd3624704bfd