[automerger skipped] Merge "A minor followup change for BPF offload device...
[automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 1cc3f4a4 -s ours am: f7780af3 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 61d59a74 is in history
Change-Id: I66d4cca9205a4e56f15edb92f9772127d7c2535d