Merge \"Re-introduce an old version of 600-verifier-fails.\"
am: 02f7cfd1b4

Change-Id: Iee7b1729a968e6e23a8a1c8cefda516cb433201c