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

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