am 5b253e55: am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""

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