Merge "BroadcastQueue: fix proto dump regression."