Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev