Merge "Revert "Workaround JDWP failures"" am: 506cf19829
am: 45c8b19ebd

* commit '45c8b19ebda04b89f3141a6a1de6a2aac88c1058':
  Revert "Workaround JDWP failures"