Merge "Remove WifiEntry transitional security type"