Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2

Change-Id: Id2f86ebd0668d27eb6002ead9f0a659b26c62c58