Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev