Merge "Fixed broken Hotspot 2.0 r1 provisioning." into nyc-dev
tree: 7c2fe4217b04e7e0a0be48a17b7b073c77be8504
  1. service/
  2. tests/