Merge "Clean departed users from OWNERS files"