[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 am: c7e9470b -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 a4e6f7b6 is in history
Change-Id: I7cfe54127b3f62a211a6fc6f591d8d6a61c9ed11