Merge "Allow Carriers to specify Wifi Networks." into nyc-mr2-dev
am: 3a122d10fa

Change-Id: Ia6becd6b4c4224c8059b815b8bfa1523edffa432