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

Change-Id: I7de9d01a4958753a456a61a2d315a5a9426041b3