Merge "Fix "jit at first use" for proxy methods." am: d959ccd388
am: cf9f18aa08

Change-Id: I20d1f937b9a946afa55c15d1b1458b521d0ea16b