Merge "Remove Tethering @TestApi"