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

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