Merge "Fix tests flakiness with jit when using Proxy classes." am: e00197d605
am: df98a5b4bb

* commit 'df98a5b4bbc2dc55d0d137470164491b32ad6577':
  Fix tests flakiness with jit when using Proxy classes.