Merge "Policy: file errors include files with attrs"