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

Change-Id: I92b45a1b7d3cb6b05bfb8abd28111d9f0ad3e1a4