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

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