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

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