Merge "Avoid creating verification_results_ unnecessarily"
am: 1847704d04

Change-Id: I307e316c2cba391bfd3ed2fae7eda731e09b2e4b