Merge "Add metrics for user revoke permission" into rvc-dev