Merge "Update comment referring to number of BroadcastQueues"