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

Change-Id: I053d5f0ab4a3f5e9ceac18c5f78b5b3648c0cf7c