Merge "wsprd: Try to clean up app_test so it is less brittle."
tree: 6e0ddd13c0981942fa9c91c5341b1b3ccb1ded91
  1. services/