Merge "Fix resource validator for style resources"