[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 skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 a4e6f7b6 is in history
Change-Id: I3db1b057e79f59a653d925e9e2116d3415d5307d