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

Change-Id: Ia879cb835fdaa937ebf09507c9b6301fb7a023e4