Merge "Use CHALLENGE_NONE when VerifyCredential invoked with challenge=0" into rvc-dev