am 8282e05e: am 12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefined reg."

* commit '8282e05e45e828df3f2d760a7cfbc3c352f5f5da':
  Clean up after verifier changes wrt. conflict/undefined reg.