Merge "Fix issue with exception type resolution during linking."
am: ea59deb1a3

* commit 'ea59deb1a3e2916054dc3fd7e5e586316dacf524':
  Fix issue with exception type resolution during linking.