Merge "[Tether06] Migrate tether offload controller into module" am: 5d6eea1bc5 am: 3bb2eae1b8
am: 8582437269

Change-Id: I067c803982ce0dbd3d7af22fe1682440c4074752