am 2ccbc05f: am 89b8691f: Merge "Enforce optimizing test marker for verification errors."

* commit '2ccbc05fa5ce5c3e31b2349219d5d5f48de065f3':
  Enforce optimizing test marker for verification errors.