Merge "Remove wigig support from S tethering" into sc-dev