Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev