Merge "Correct javadoc for an auto-revoke API" into rvc-dev