Revert "added TeamUB build tag"

This reverts commit f1c251d8259f994595e730f20da7850bac10a767.
Revert "Revert "Switch to common_wifi_only""

This reverts commit de44986922665fee681af96ca1caaca6f2f9bda1.