am fd60fbcc: Merge "Fix GVN to handle normal paths leading to catch entry."

* commit 'fd60fbcce909655aad71fa3094aa51d49302f19f':
  Fix GVN to handle normal paths leading to catch entry.