Merge "Fix duplicate permission privilege escalation" into rvc-dev