Merge "Workaround JDWP failures" am: a64c281ae7
am: 36692f34a8

* commit '36692f34a85badc99af80eac370bbd9a6adf0fbb':
  Workaround JDWP failures