Merge "DO NOT MERGE: Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
tree: efca4cbbfe354a0f8c06a00f5d5ba3be21b7b69b
  1. service/
  2. tests/