am dbf6f33e: am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""

* commit 'dbf6f33e84a4de9944b782ec079ba8b51f3e9c25':
  Revert "Remove netcfg's unused options."