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

Change-Id: I0835653960e11dfdbdcade5d2c067e8ad1cad697