Merge "veyron/services/wsprd: Changes to accompany https://veyron-review.googlesource.com/6271"
tree: 33be88d5638a2c7a8a0a08602e2a3f804639708b
  1. services/