Merge "Merge "Test: Fix for CTS/STS test b/35644815" into oreo-cts-dev am: 9314eb5e6a"