Merge "SourceStampVerification Return more specific error code when verification fails"