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

Change-Id: I467f5a4f62b7d2f21fdf8f1e1a43fb55b5e69fec
tree: 1babb1db341de1fd7a72132a91fbf8c92cd6fada
  1. Tethering/