[automerger skipped] Merge "Unbreak tethering for no offload supported...
[automerger skipped] Merge "Unbreak tethering for no offload supported devices" into rvc-dev am: 48a2ffac am: 182fea42 -s ours
am skip reason: Change-Id Ie0a32a9062c722327a27c6de13e3bb8d9588bebb with SHA-1 c5534380 is in history
Change-Id: I3c71d7ea08af30bce99bfdf7f8454a06d698a256