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

Change-Id: Ia92bb51c851bcd6d957a15f81d49418ea68376df