Merge "Don't fixup proxy method arguments after invoking the InvocationHandler." am: 8ccef7e842 am: 5e41c15b5c
am: 95857809ec

Change-Id: I5ccadc4d5aa678724c2ee823131c19db5f459f77