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

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