Merge "Refactor 1.0 TetheroffloadControl VTS"