Merge "Avoid duplicate BSSIDs" into sc-dev