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

Change-Id: I8169f02159771093821441cf774eb75ec107a77f