Merge "Rename getXXX to makeXXX in TetheringDependencies" into main