Merge "Revert "Default-disable tethering offload"" into oc-mr1-dev