Merge "Fix event reporting from the debugger thread"
am: 60438b4609

Change-Id: Ia6187cdfb3b2fb459093cd1b8f2aff8c8c9b4adb