Merge "Include GIDs for unenforced permissions."