workaround for URL redirect causes flaky failures

Change-Id: I34444741a7b0fa78edb95830ac1dee9aa72e8c70
Merge "workaround for URL redirect causes flaky failures"