Allow for bypass_url when using proxy_token

Change-Id: I1cb76f79fbf2fe02ce012aaa278f50987c073831
Merge "Allow for bypass_url when using proxy_token"