Merge "Do not blocklist BDS on CN builds" into main