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

Change-Id: Ief6f800aa70e7d68c62e5eee72734fbf44a967ef