fix checking cid format
Merge remote-tracking branch 'google-measurement-protocol/validator'