Merge "Fix some resources OWNERS files"