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

Change-Id: Ia918bd348462aefaf0474dfe9a66ec9fa7ef76b8