am 1ddbd76b: am 67900498: Merge "Remove netcfg\'s unused options."

* commit '1ddbd76bd8eededb5d854dc588d3cef68cdc0c69':
  Remove netcfg's unused options.