Merge "wifi: use profile key to find possible upgradable type config" into sc-dev