Merge "Move broadcast radio 1.2 default implementation back to 1.1."