Merge "Handle catch phis in code sinking."
am: d1a05c9088

Change-Id: Ic74f2072db754e34874cc30efa1b086db9e8d411