Merge "Fix JDWP event races" into lmp-dev