Merge "Start of tethering OffloadController"
am: 121006f428

Change-Id: I590569818c7d7ac50dcc61bd7058bd7c5cad4e77