Merge "Remove wigig support from S tethering"