Merge "Deprecate SKIP_VALIDATE."