am bacabce9: Merge "Add back a deleted check related to verification." into lmp-dev

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