Follow-up from "Validate with latest vendored patch schema version"

The following discussion from !94265 (merged) should be addressed: