Merge "Default-disable tethering offload" into oc-dr1-dev
am: 1244ff1956

Change-Id: I289fb5e7cc41d617065c3358cc4810d1825c3ff0