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