wspr should not have a seperate retryTimeout.
wspr should not have a seperate retryTimeout.

Fixes veyron/release-issues/#1503

MultiPart: 1/2

Change-Id: Id04f4cfd76bce954d6d825e9f869a242debb07a4

vanadium/go.ref,vanadium/go.ref,vanadium/go.ref,vanadium/go.ref,vanadium/go.ref,vanadium/go.ref