Merge "Fix bug where verification could crash on unresolved types." am: 3bff678
am: d344ab3

* commit 'd344ab34612208e466e78b1162214d5ec1f95019':
  Fix bug where verification could crash on unresolved types.