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

Change-Id: I25abcd0378d178778688a5c5e495d98e5df21e01