Merge "Unbreak tethering for no offload supported devices" into rvc-dev am: 48a2ffac38

Change-Id: Ibb783aeacc0f15b865508f7e48ed43ef35a4933d