Merge "Fix USB tether option" into sc-qpr1-dev