Merge "Fix errors in INFO.yaml"