Merge "Fix AutoRevokeTest flakiness" into rvc-dev