Merge "Avoid creating verification_results_ unnecessarily" am: 1847704d04 am: 8e0d517385
am: c996491097

Change-Id: I172970433ac1aa692aac66c5470bbd2d59b724d4