Merge "Fix tests flakiness with jit when using Proxy classes."