Merge "Fix Broadcast Radio test to not fail on HD Radio."