Merge "Fix Protected Broadcast Name for DEBUG_EVENT"
am: 31dd725598

Change-Id: Ic3329273f4d9b9d4ebcabc3a6429284a13bf609d