Merge "Handle catch phis in code sinking." am: d1a05c9088 am: 7a717284ab
am: 0ac60fee7a

Change-Id: I302165f06e65ad94a96a5d80d6fa5df499aea44a