Merge "Update net-config-noop to use apply-config"