Merge "Tethering: Add WiGig support"