Merge "Start of tethering OffloadController" am: 121006f428
am: 4568fa4a82

Change-Id: Ib1a7b2cad37e85335d498a12d36f0209b33d5c26