Merge "Avoid creating verification_results_ unnecessarily"