Merge "Remove setting BSS color in hostapd.conf"