Merge "Conditionally include VCN in Tethering module" into main