Merge "Replace VerificationToken with TimeStampToken."