Merge "Fix tethering apex version to be 30xxxx series, not 29xxxx"