Merge "Move inserted method after end of try block" am: b080b22a am: a413870e am: 4a3caf17 am: 3a40330f am: fd3326f3 Change-Id: I63f13e5957180e4bc332d8f8c1e29508806a49f0