Allow v2 to use storage_url/storage_token directly

- Fixes bug 1134306.

Change-Id: Ie1737c57f57bcdad50b3096c921d46a1fe5293b8
Merge "Allow v2 to use storage_url/storage_token directly"