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

Change-Id: I70460380585f60500ca966c4035c40a7caf015b1