Merge "Fix accounting of permission gids."