Merge "[SdkSetup] Disable Offload Tethering" am: c3db8555b4 am: 9e6a2bd5ad

Change-Id: I11e9fd36bbc7714babdcc05e6be6fa95f897d889