Merge changes I53ca4b98,I1757fdeb

* changes:
  Fix OffloadHardwareInterfaceTest.
  tethering: offload: Netlink Req NfGen