Merge "Workaround JDWP failures"
am: a64c281ae7

* commit 'a64c281ae741bf35de36ac6ea9437e3f5be678b2':
  Workaround JDWP failures