Merge branch 'broadcom_drops' into HEAD

Merge broadcom_drops after the fact to simplify merging later releases
from Broadcom.