Merge "Enforce optimizing test marker for verification errors."