Merge "Improve Tethering Test Wording" into oreo-mr1-cts-dev