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

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