Merge "Add PRODUCT_VALIDATION_CHECKS" into main