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

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