Merge "Revert "Revert "Add 'basic rates' IE to wifi IE whitelist""" into oc-dev