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

Change-Id: Ib6c4527df0f575217bad0c7e1f2a6b50f203beb7