Merge "Start of tethering OffloadController"