am 81457a3c: Merge "Add back a deleted check related to verification."

* commit '81457a3cd8fca14396b5785a4e4c8070c259b07a':
  Add back a deleted check related to verification.