Merge "Update PermissionChecker usages to avoid unnecessary attribution."