Merge "Change MAC mapping to use <SSID,SecurityType>"