Merge "Validate during NN conversions by default -- hal"