am 7a8c9378: am 7e72d990: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev

* commit '7a8c9378cfab07191c433b8b4725df2e8e4dcb81':
  Allow goldfish-setup to put the emulator in WiFi-only mode