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

Change-Id: I3b6d4b40e4f5edb52486b6b77c888ae2f53b5dcf