Merge "Rename selfRevokePermissions to revokeOwnPermissionsOnKill"