am b862d3e8: am 6a728fde: Merge "Remove netcfg\'s unused options."

* commit 'b862d3e8eb92323983020830f3d39240d6cfbee3':
  Remove netcfg's unused options.