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

Change-Id: I1782095a41d6372542e631a6fbe368b7bb030111