Merge "Make NewApi to error in Tethering" into main