Merge "ref: Change proxyd flags from underscores to hyphens."