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

Change-Id: I6c903ef30f0f539e936de701c60b72ee950b3f5b