Merge "Allow tests for more PermissionControllerManager methods" into rvc-dev