Merge "Add missing INFO.yaml blocks"