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

Change-Id: Iae9e94011fe4ad232e049a7e18defed9c2cc2ce6