Merge "Move inserted method after end of try block" am: b080b22a17 am: a413870ef5 am: 4a3caf1719 am: 3a40330f3f
am: fd3326f3d3

Change-Id: I63f13e5957180e4bc332d8f8c1e29508806a49f0