diff --git a/wifi/1.0/vts/Wifi.vts b/wifi/1.0/vts/Wifi.vts
index 85c901a7..3f567a4 100644
--- a/wifi/1.0/vts/Wifi.vts
+++ b/wifi/1.0/vts/Wifi.vts
@@ -20,3025 +20,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "APF"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BACKGROUND_SCAN"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "LINK_LAYER_STATS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "RSSI_MONITOR"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "CONTROL_ROAMING"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "PROBE_IE_WHITELIST"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "SCAN_RAND"
-            scalar_value: {
-                uint32_t: 64
-            }
-            enumerator: "STA_5G"
-            scalar_value: {
-                uint32_t: 128
-            }
-            enumerator: "HOTSPOT"
-            scalar_value: {
-                uint32_t: 256
-            }
-            enumerator: "PNO"
-            scalar_value: {
-                uint32_t: 512
-            }
-            enumerator: "TDLS"
-            scalar_value: {
-                uint32_t: 1024
-            }
-            enumerator: "TDLS_OFFCHANNEL"
-            scalar_value: {
-                uint32_t: 2048
-            }
-            enumerator: "ND_OFFLOAD"
-            scalar_value: {
-                uint32_t: 4096
-            }
-            enumerator: "KEEP_ALIVE"
-            scalar_value: {
-                uint32_t: 8192
-            }
-            enumerator: "DEBUG_PACKET_FATE"
-            scalar_value: {
-                uint32_t: 16384
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombinationLimit"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "types"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ENUM
-                predefined_type: "::android::hardware::wifi::V1_0::IfaceType"
-            }
-        }
-        struct_value: {
-            name: "maxIfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombination"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "limits"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombinationLimit"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipMode"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "availableCombinations"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombination"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipDebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "driverDescription"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "firmwareDescription"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiChip::ChipCapabilityMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DEBUG_MEMORY_FIRMWARE_DUMP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "DEBUG_MEMORY_DRIVER_DUMP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "DEBUG_RING_BUFFER_CONNECT_EVENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "DEBUG_RING_BUFFER_POWER_EVENT"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DEBUG_RING_BUFFER_WAKELOCK_EVENT"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "DEBUG_RING_BUFFER_VENDOR_DATA"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "DEBUG_HOST_WAKE_REASON_STATS"
-            scalar_value: {
-                uint32_t: 64
-            }
-            enumerator: "DEBUG_ERROR_ALERTS"
-            scalar_value: {
-                uint32_t: 128
-            }
-        }
-    }
-
     api: {
         name: "registerEventCallback"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiApIface.vts b/wifi/1.0/vts/WifiApIface.vts
index f231e4f..6b58058 100644
--- a/wifi/1.0/vts/WifiApIface.vts
+++ b/wifi/1.0/vts/WifiApIface.vts
@@ -9,2853 +9,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "getType"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiChip.vts b/wifi/1.0/vts/WifiChip.vts
index 53b1bc5..1208202 100644
--- a/wifi/1.0/vts/WifiChip.vts
+++ b/wifi/1.0/vts/WifiChip.vts
@@ -19,2922 +19,6 @@
 
 interface: {
     attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "APF"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BACKGROUND_SCAN"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "LINK_LAYER_STATS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "RSSI_MONITOR"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "CONTROL_ROAMING"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "PROBE_IE_WHITELIST"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "SCAN_RAND"
-            scalar_value: {
-                uint32_t: 64
-            }
-            enumerator: "STA_5G"
-            scalar_value: {
-                uint32_t: 128
-            }
-            enumerator: "HOTSPOT"
-            scalar_value: {
-                uint32_t: 256
-            }
-            enumerator: "PNO"
-            scalar_value: {
-                uint32_t: 512
-            }
-            enumerator: "TDLS"
-            scalar_value: {
-                uint32_t: 1024
-            }
-            enumerator: "TDLS_OFFCHANNEL"
-            scalar_value: {
-                uint32_t: 2048
-            }
-            enumerator: "ND_OFFLOAD"
-            scalar_value: {
-                uint32_t: 4096
-            }
-            enumerator: "KEEP_ALIVE"
-            scalar_value: {
-                uint32_t: 8192
-            }
-            enumerator: "DEBUG_PACKET_FATE"
-            scalar_value: {
-                uint32_t: 16384
-            }
-        }
-    }
-
-    attribute: {
         name: "::android::hardware::wifi::V1_0::IWifiChip::ChipIfaceCombinationLimit"
         type: TYPE_STRUCT
         struct_value: {
diff --git a/wifi/1.0/vts/WifiChipEventCallback.vts b/wifi/1.0/vts/WifiChipEventCallback.vts
index 7467d05..2246f82 100644
--- a/wifi/1.0/vts/WifiChipEventCallback.vts
+++ b/wifi/1.0/vts/WifiChipEventCallback.vts
@@ -8,2853 +8,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "onChipReconfigured"
         arg: {
diff --git a/wifi/1.0/vts/WifiEventCallback.vts b/wifi/1.0/vts/WifiEventCallback.vts
index 458672b..60ec87c 100644
--- a/wifi/1.0/vts/WifiEventCallback.vts
+++ b/wifi/1.0/vts/WifiEventCallback.vts
@@ -8,2853 +8,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "onStart"
     }
diff --git a/wifi/1.0/vts/WifiIface.vts b/wifi/1.0/vts/WifiIface.vts
index 0327509..0de0f8d 100644
--- a/wifi/1.0/vts/WifiIface.vts
+++ b/wifi/1.0/vts/WifiIface.vts
@@ -8,2853 +8,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "getType"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiNanIface.vts b/wifi/1.0/vts/WifiNanIface.vts
index 924f564..66c8755 100644
--- a/wifi/1.0/vts/WifiNanIface.vts
+++ b/wifi/1.0/vts/WifiNanIface.vts
@@ -10,2853 +10,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "getType"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiNanIfaceEventCallback.vts b/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
index f2bb608..e3e82f7 100644
--- a/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
+++ b/wifi/1.0/vts/WifiNanIfaceEventCallback.vts
@@ -8,2853 +8,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "notifyCapabilitiesResponse"
         arg: {
diff --git a/wifi/1.0/vts/WifiP2pIface.vts b/wifi/1.0/vts/WifiP2pIface.vts
index 94f3de6..220f332 100644
--- a/wifi/1.0/vts/WifiP2pIface.vts
+++ b/wifi/1.0/vts/WifiP2pIface.vts
@@ -9,2853 +9,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "getType"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiRttController.vts b/wifi/1.0/vts/WifiRttController.vts
index 3ed2885..45fb309 100644
--- a/wifi/1.0/vts/WifiRttController.vts
+++ b/wifi/1.0/vts/WifiRttController.vts
@@ -10,2853 +10,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "getBoundIface"
         return_type_hidl: {
diff --git a/wifi/1.0/vts/WifiRttControllerEventCallback.vts b/wifi/1.0/vts/WifiRttControllerEventCallback.vts
index ab69dea..e3c2651 100644
--- a/wifi/1.0/vts/WifiRttControllerEventCallback.vts
+++ b/wifi/1.0/vts/WifiRttControllerEventCallback.vts
@@ -8,2853 +8,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "onResults"
         arg: {
diff --git a/wifi/1.0/vts/WifiStaIface.vts b/wifi/1.0/vts/WifiStaIface.vts
index ecd0ae2..1edf4db 100644
--- a/wifi/1.0/vts/WifiStaIface.vts
+++ b/wifi/1.0/vts/WifiStaIface.vts
@@ -11,2853 +11,6 @@
 
 interface: {
     attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
         name: "::android::hardware::wifi::V1_0::IWifiStaIface::StaIfaceCapabilityMask"
         type: TYPE_ENUM
         enum_value: {
diff --git a/wifi/1.0/vts/WifiStaIfaceEventCallback.vts b/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
index b8156d0..99bf03f 100644
--- a/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
+++ b/wifi/1.0/vts/WifiStaIfaceEventCallback.vts
@@ -8,2853 +8,6 @@
 import: "android.hidl.base@1.0::types"
 
 interface: {
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ERROR_WIFI_CHIP_INVALID"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "ERROR_WIFI_IFACE_INVALID"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "ERROR_WIFI_RTT_CONTROLLER_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "ERROR_NOT_SUPPORTED"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "ERROR_NOT_AVAILABLE"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "ERROR_NOT_STARTED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "ERROR_INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ERROR_BUSY"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "ERROR_UNKNOWN"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "code"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiStatusCode"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::IfaceType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "P2P"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WIDTH_20"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "WIDTH_40"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "WIDTH_80"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "WIDTH_160"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "WIDTH_80P80"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "WIDTH_5"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "WIDTH_10"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "WIDTH_INVALID"
-            scalar_value: {
-                uint32_t: 4294967295
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "width"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "centerFreq"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq0"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "centerFreq1"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "id"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "data"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "OFDM"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "CCK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "RESERVED"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateNss"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NSS_1x1"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NSS_2x2"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "NSS_3x3"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NSS_4x4"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRatePreamble"
-        }
-        struct_value: {
-            name: "nss"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateNss"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelWidthInMhz"
-        }
-        struct_value: {
-            name: "rateMcsIdx"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "bitRateInKbps"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaApfPacketFilterCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "version"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxLength"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxCacheSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxBuckets"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApCachePerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxReportingThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BAND_UNSPECIFIED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BAND_5GHZ_DFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BAND_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "BAND_24GHZ_5GHZ"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "BAND_24GHZ_5GHZ_WITH_DFS"
-            scalar_value: {
-                uint32_t: 7
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "EACH_SCAN"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FULL_RESULTS"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "NO_BATCH"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "band"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBand"
-        }
-        struct_value: {
-            name: "frequencies"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "periodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "eventReportScheme"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketEventReportSchemeMask"
-        }
-        struct_value: {
-            name: "exponentialMaxPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialBase"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "exponentialStepCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaBackgroundScanParameters"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "basePeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxApPerScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdPercent"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "reportThresholdNumScans"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "buckets"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaBackgroundScanBucketParameters"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "txMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "lostMpdu"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "retries"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "beaconRx"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "avgRssiMgmt"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "wmeBePktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeBkPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeViPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-        struct_value: {
-            name: "wmeVoPktStats"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfacePacketStats"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "onTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "txTimeInMsPerLevel"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "rxTimeInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "onTimeInMsForScan"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaLinkLayerStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "iface"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerIfaceStats"
-        }
-        struct_value: {
-            name: "radio"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::StaLinkLayerRadioStats"
-        }
-        struct_value: {
-            name: "timeStampInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "ssid"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "bssid"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "frequency"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "beaconPeriodInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "capability"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "informationElements"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "int32_t"
-
-            enumerator: "INTERRUPTED"
-            scalar_value: {
-                int32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaScanData"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "flags"
-            type: TYPE_MASK
-            scalar_type: "int32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::StaScanDataFlagMask"
-        }
-        struct_value: {
-            name: "bucketsScanned"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "results"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_STRUCT
-                predefined_type: "::android::hardware::wifi::V1_0::StaScanResult"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxBlacklistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxWhitelistSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "bssidBlacklist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-        struct_value: {
-            name: "ssidWhitelist"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 32
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::StaRoamingState"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint8_t"
-
-            enumerator: "DISABLED"
-            scalar_value: {
-                uint8_t: 0
-            }
-            enumerator: "ENABLED"
-            scalar_value: {
-                uint8_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanStatusType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "INTERNAL_FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "PROTOCOL_FAILURE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "INVALID_SESSION_ID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "NO_RESOURCES_AVAILABLE"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "INVALID_ARGS"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "INVALID_PEER_ID"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "INVALID_NDP_ID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "NAN_NOT_ALLOWED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "NO_OTA_ACK"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "ALREADY_ENABLED"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FOLLOWUP_TX_QUEUE_FULL"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "UNSUPPORTED_CONCURRENCY_NAN_DISABLED"
-            scalar_value: {
-                uint32_t: 12
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandIndex"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NAN_BAND_24GHZ"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "NAN_BAND_5GHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanStatusType"
-        }
-        struct_value: {
-            name: "description"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "MATCH_ONCE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "MATCH_CONTINUOUS"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MATCH_NEVER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNSOLICITED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SOLICITED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNSOLICITED_SOLICITED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTxType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BROADCAST"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "UNICAST"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "PASSIVE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ACTIVE"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSrfType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BLOOM_FILTER"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "PARTIAL_MAC_ADDR"
-            scalar_value: {
-                uint32_t: 1
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CHANNEL_NOT_REQUESTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "REQUEST_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FORCE_CHANNEL_SETUP"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rssiClose"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiMiddle"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiCloseProximity"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "dwellTimeMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "scanPeriodSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validDiscoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryWindowIntervalVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "validClusterIdVals"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "clusterIdBottomRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "clusterIdTopRangeVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "validIntfAddrVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddrVal"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "validOuiVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ouiVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "validRandomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "randomFactorForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validHopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "hopCountForceVal"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "validDiscoveryChannelVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "discoveryChannelMhzVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "validUseBeaconsInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useBeaconsInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "validUseSdfInBandVal"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "useSdfInBandVal"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "masterPref"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryAddressChangeIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableStartedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableJoinedClusterIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "includePublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfPublishServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "includeSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "numberOfSubscribeServiceIdsInBeacon"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "rssiWindowSize"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "macAddressRandomizationIntervalSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "acceptRangingRequests"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "bandSpecificConfig"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                name: "::android::hardware::wifi::V1_0::NanBandSpecificConfig"
-                type: TYPE_STRUCT
-                struct_value: {
-                    name: "rssiClose"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiMiddle"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "rssiCloseProximity"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "dwellTimeMs"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-                struct_value: {
-                    name: "scanPeriodSec"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint16_t"
-                }
-                struct_value: {
-                    name: "validDiscoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "bool_t"
-                }
-                struct_value: {
-                    name: "discoveryWindowIntervalVal"
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanEnableRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "operateInBand"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "bool_t"
-            }
-        }
-        struct_value: {
-            name: "hopCountMax"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "configParams"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanConfigRequest"
-        }
-        struct_value: {
-            name: "debugConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDebugConfig"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SHARED_KEY_128_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "SHARED_KEY_256_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "CONTINUOUS_INDICATION_MASK"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "INGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EGRESS_MET_MASK"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "sessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "ttlSec"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryWindowPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "discoveryCount"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "serviceName"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "discoveryMatchIndicator"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanMatchAlg"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "rxMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "txMatchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "useRssiThreshold"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableDiscoveryTerminationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableMatchExpirationIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "disableFollowupReceivedIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "securityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingIntervalMsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "configRangingIndications"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-        struct_value: {
-            name: "distanceIngressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-        struct_value: {
-            name: "distanceEgressCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint16_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanPublishRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "publishType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanPublishType"
-        }
-        struct_value: {
-            name: "txType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanTxType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanSubscribeRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "baseConfigs"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::NanDiscoveryCommonConfig"
-        }
-        struct_value: {
-            name: "subscribeType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSubscribeType"
-        }
-        struct_value: {
-            name: "srfType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanSrfType"
-        }
-        struct_value: {
-            name: "srfRespondIfInAddressSet"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseSrf"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "isSsiRequiredForMatch"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "intfAddr"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_ARRAY
-                vector_size: 6
-                vector_value: {
-                    type: TYPE_SCALAR
-                    scalar_type: "uint8_t"
-                }
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanTransmitFollowupRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "isHighPriority"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "shouldUseDiscoveryWindow"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "disableFollowupResultIndication"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanInitiateDataPathRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "channelRequestType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanDataPathChannelCfg"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanRespondToDataPathIndicationRequest"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "acceptRequest"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ifaceName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "supportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "pmk"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "maxConcurrentClusters"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxPublishes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceNameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxTotalMatchFilterLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxExtendedServiceSpecificInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxVsaDataLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdiInterfaces"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxNdpSessions"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxAppInfoLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxQueuedTransmitFollowupMsgs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "maxSubscribeInterfaceAddresses"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "supportedCipherSuites"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanMatchInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchFilter"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "matchOccuredInBeaconFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "outOfResourceFlag"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rssiValue"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerSupportedCipherTypes"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanCipherSuiteType"
-        }
-        struct_value: {
-            name: "peerRequiresSecurityEnabledInNdp"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerRequiresRanging"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rangingMeasurementInCm"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rangingIndicationType"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::NanRangingIndication"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanFollowupReceivedInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "receivedInFaw"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "serviceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "extendedServiceSpecificInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "DISCOVERY_MAC_ADDRESS_CHANGED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "STARTED_CLUSTER"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "JOINED_CLUSTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanClusterEventInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "eventType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::NanClusterEventType"
-        }
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathRequestInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "discoverySessionId"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "peerDiscMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "securityRequired"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::NanDataPathConfirmInd"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ndpInstanceId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "dataPathSetupSuccess"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "peerNdiMacAddr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "appInfo"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiNanStatus"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttStatus"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FAILURE"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FAIL_NO_RSP"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FAIL_REJECTED"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FAIL_NOT_SCHEDULED_YET"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FAIL_TM_TIMEOUT"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "FAIL_AP_ON_DIFF_CHANNEL"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "FAIL_NO_CAPABILITY"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "ABORTED"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "FAIL_INVALID_TS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "FAIL_PROTOCOL"
-            scalar_value: {
-                uint32_t: 10
-            }
-            enumerator: "FAIL_SCHEDULE"
-            scalar_value: {
-                uint32_t: 11
-            }
-            enumerator: "FAIL_BUSY_TRY_LATER"
-            scalar_value: {
-                uint32_t: 12
-            }
-            enumerator: "INVALID_REQ"
-            scalar_value: {
-                uint32_t: 13
-            }
-            enumerator: "NO_WIFI"
-            scalar_value: {
-                uint32_t: 14
-            }
-            enumerator: "FAIL_FTM_PARAM_OVERRIDE"
-            scalar_value: {
-                uint32_t: 15
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPeerType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "AP"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "STA"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "P2P_GO"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "P2P_CLIENT"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "NAN"
-            scalar_value: {
-                uint32_t: 5
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttBw"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "BW_5MHZ"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "BW_10MHZ"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "BW_20MHZ"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "BW_40MHZ"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "BW_80MHZ"
-            scalar_value: {
-                uint32_t: 16
-            }
-            enumerator: "BW_160MHZ"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttPreamble"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "LEGACY"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HT"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "VHT"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ONE_SIDED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "TWO_SIDED"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttConfig"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "peer"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPeerType"
-        }
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "burstPeriod"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numFramesPerBurst"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerRttFrame"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numRetriesPerFtmr"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "mustRequestLci"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "mustRequestLcr"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "burstDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bw"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResult"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "addr"
-            type: TYPE_ARRAY
-            vector_size: 6
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-        struct_value: {
-            name: "burstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "measurementNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "successNumber"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "numberPerBurstPeer"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "status"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttStatus"
-        }
-        struct_value: {
-            name: "retryAfterDuration"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "type"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttType"
-        }
-        struct_value: {
-            name: "rssi"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "rssiSpread"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "txRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rxRate"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiRateInfo"
-        }
-        struct_value: {
-            name: "rtt"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSd"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "rttSpread"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "distanceInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSdInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "distanceSpreadInMm"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "timeStampInUs"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "burstDurationInMs"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "negotiatedBurstNum"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "lci"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-        struct_value: {
-            name: "lcr"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiInformationElement"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttCapabilities"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rttOneSidedSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "rttFtmSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lciSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "lcrSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "responderSupported"
-            type: TYPE_SCALAR
-            scalar_type: "bool_t"
-        }
-        struct_value: {
-            name: "preambleSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-        struct_value: {
-            name: "bwSupport"
-            type: TYPE_MASK
-            scalar_type: "uint32_t"
-            predefined_type: "::android::hardware::wifi::V1_0::RttBw"
-        }
-        struct_value: {
-            name: "mcVersion"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NOT_EXPECTED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "EXPECTED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLciInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "latitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "longitude"
-            type: TYPE_SCALAR
-            scalar_type: "int64_t"
-        }
-        struct_value: {
-            name: "altitude"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "latitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "longitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "altitudeUnc"
-            type: TYPE_SCALAR
-            scalar_type: "uint8_t"
-        }
-        struct_value: {
-            name: "motionPattern"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttMotionPattern"
-        }
-        struct_value: {
-            name: "floor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightAboveFloor"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "heightUnc"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttLcrInformation"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "countryCode"
-            type: TYPE_ARRAY
-            vector_size: 2
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "int8_t"
-            }
-        }
-        struct_value: {
-            name: "civicInfo"
-            type: TYPE_STRING
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::RttResponder"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "channel"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiChannelInfo"
-        }
-        struct_value: {
-            name: "preamble"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::RttPreamble"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferFlags"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "HAS_BINARY_ENTRIES"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "HAS_ASCII_ENTRIES"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "HAS_PER_PACKET_ENTRIES"
-            scalar_value: {
-                uint32_t: 4
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferStatus"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ringName"
-            type: TYPE_STRING
-        }
-        struct_value: {
-            name: "flags"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ringId"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "sizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "freeSizeInBytes"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "verboseLevel"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRingBufferVerboseLevel"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "NONE"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "DEFAULT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "VERBOSE"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "EXCESSIVE"
-            scalar_value: {
-                uint32_t: 3
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "ACKED"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "SENT"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 9
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "SUCCESS"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "FW_QUEUED"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "FW_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 2
-            }
-            enumerator: "FW_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 3
-            }
-            enumerator: "FW_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 4
-            }
-            enumerator: "FW_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 5
-            }
-            enumerator: "DRV_QUEUED"
-            scalar_value: {
-                uint32_t: 6
-            }
-            enumerator: "DRV_DROP_FILTER"
-            scalar_value: {
-                uint32_t: 7
-            }
-            enumerator: "DRV_DROP_INVALID"
-            scalar_value: {
-                uint32_t: 8
-            }
-            enumerator: "DRV_DROP_NOBUFS"
-            scalar_value: {
-                uint32_t: 9
-            }
-            enumerator: "DRV_DROP_OTHER"
-            scalar_value: {
-                uint32_t: 10
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "UNKNOWN"
-            scalar_value: {
-                uint32_t: 0
-            }
-            enumerator: "ETHERNET_II"
-            scalar_value: {
-                uint32_t: 1
-            }
-            enumerator: "MGMT_80211"
-            scalar_value: {
-                uint32_t: 2
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "frameType"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameType"
-        }
-        struct_value: {
-            name: "frameLen"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "driverTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "firmwareTimestampUsec"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-        struct_value: {
-            name: "frameContent"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint8_t"
-            }
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugTxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFateReport"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "fate"
-            type: TYPE_ENUM
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugRxPacketFate"
-        }
-        struct_value: {
-            name: "frameInfo"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugPacketFateFrameInfo"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "rxUnicastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxMulticastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxBroadcastCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "ipv4RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "ipv6RxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "otherRxMulticastAddrCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "icmpPkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Pkt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ra"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Na"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "icmp6Ns"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-    }
-
-    attribute: {
-        name: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonStats"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "totalCmdEventWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "cmdEventWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalDriverFwLocalWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "driverFwLocalWakeCntPerType"
-            type: TYPE_VECTOR
-            vector_value: {
-                type: TYPE_SCALAR
-                scalar_type: "uint32_t"
-            }
-        }
-        struct_value: {
-            name: "totalRxPacketWakeCnt"
-            type: TYPE_SCALAR
-            scalar_type: "uint32_t"
-        }
-        struct_value: {
-            name: "rxPktWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxPacketDetails"
-        }
-        struct_value: {
-            name: "rxMulticastPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxMulticastPacketDetails"
-        }
-        struct_value: {
-            name: "rxIcmpPkWakeDetails"
-            type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::V1_0::WifiDebugHostWakeReasonRxIcmpPacketDetails"
-        }
-    }
-
-    attribute: {
-        name: "::android::hidl::base::V1_0::DebugInfo"
-        type: TYPE_STRUCT
-        struct_value: {
-            name: "pid"
-            type: TYPE_SCALAR
-            scalar_type: "int32_t"
-        }
-        struct_value: {
-            name: "ptr"
-            type: TYPE_SCALAR
-            scalar_type: "uint64_t"
-        }
-    }
-
     api: {
         name: "onBackgroundScanFailure"
         arg: {
diff --git a/wifi/1.0/vts/types.vts b/wifi/1.0/vts/types.vts
index 12a5060..388dbc3 100644
--- a/wifi/1.0/vts/types.vts
+++ b/wifi/1.0/vts/types.vts
@@ -1632,11 +1632,6 @@
         scalar_type: "uint32_t"
     }
     struct_value: {
-        name: "maxVsaDataLen"
-        type: TYPE_SCALAR
-        scalar_type: "uint32_t"
-    }
-    struct_value: {
         name: "maxNdiInterfaces"
         type: TYPE_SCALAR
         scalar_type: "uint32_t"
diff --git a/wifi/supplicant/1.0/vts/Supplicant.vts b/wifi/supplicant/1.0/vts/Supplicant.vts
index 69fe209..534b1cf 100644
--- a/wifi/supplicant/1.0/vts/Supplicant.vts
+++ b/wifi/supplicant/1.0/vts/Supplicant.vts
@@ -6,7 +6,9 @@
 
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantCallback"
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantIface"
+import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -64,8 +66,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantIface"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantIface"
         }
         arg: {
             type: TYPE_STRUCT
@@ -96,8 +97,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "ISupplicantCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantCallback"
         }
     }
 
diff --git a/wifi/supplicant/1.0/vts/SupplicantCallback.vts b/wifi/supplicant/1.0/vts/SupplicantCallback.vts
index e439bd6..2d9e991 100644
--- a/wifi/supplicant/1.0/vts/SupplicantCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantCallback.vts
@@ -4,6 +4,7 @@
 
 package: "android.hardware.wifi.supplicant"
 
+import: "android.hidl.base@1.0::types"
 
 interface: {
     api: {
diff --git a/wifi/supplicant/1.0/vts/SupplicantIface.vts b/wifi/supplicant/1.0/vts/SupplicantIface.vts
index 41c77f8..c703ec0 100644
--- a/wifi/supplicant/1.0/vts/SupplicantIface.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantIface.vts
@@ -6,6 +6,7 @@
 
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -68,8 +69,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantNetwork"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
         }
     }
 
@@ -93,8 +93,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantNetwork"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
         }
         arg: {
             type: TYPE_SCALAR
@@ -129,6 +128,22 @@
     }
 
     api: {
+        name: "setWpsDeviceType"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_ARRAY
+            vector_size: 8
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    api: {
         name: "setWpsManufacturer"
         return_type_hidl: {
             type: TYPE_STRUCT
@@ -180,6 +195,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint16_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
         }
     }
diff --git a/wifi/supplicant/1.0/vts/SupplicantNetwork.vts b/wifi/supplicant/1.0/vts/SupplicantNetwork.vts
index edcabce..c90f396 100644
--- a/wifi/supplicant/1.0/vts/SupplicantNetwork.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantNetwork.vts
@@ -5,6 +5,7 @@
 package: "android.hardware.wifi.supplicant"
 
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     api: {
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts b/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts
index afa9a8c..2515b60 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pIface.vts
@@ -5,40 +5,13 @@
 package: "android.hardware.wifi.supplicant"
 
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantIface"
+import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantP2pIfaceCallback"
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
-        name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantIface::ParamSizeLimits"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WPS_DEVICE_NAME_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "WPS_MANUFACTURER_MAX_LEN"
-            scalar_value: {
-                uint32_t: 64
-            }
-            enumerator: "WPS_MODEL_NAME_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "WPS_MODEL_NUMBER_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "WPS_SERIAL_NUMBER_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
         name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantP2pIface::WpsProvisionMethod"
         type: TYPE_ENUM
         enum_value: {
@@ -126,8 +99,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantNetwork"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
         }
     }
 
@@ -151,8 +123,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantNetwork"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
         }
         arg: {
             type: TYPE_SCALAR
@@ -187,6 +158,22 @@
     }
 
     api: {
+        name: "setWpsDeviceType"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_ARRAY
+            vector_size: 8
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    api: {
         name: "setWpsManufacturer"
         return_type_hidl: {
             type: TYPE_STRUCT
@@ -238,6 +225,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint16_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
         }
     }
@@ -250,8 +238,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "ISupplicantP2pIfaceCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantP2pIfaceCallback"
         }
     }
 
@@ -263,8 +250,8 @@
         }
         return_type_hidl: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -355,8 +342,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -398,8 +385,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -445,8 +432,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -464,16 +451,16 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -492,8 +479,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -562,8 +549,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -578,12 +565,13 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::P2pGroupCapabilityMask"
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -677,8 +665,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -727,8 +715,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -763,8 +751,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -802,8 +790,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 8
             vector_value: {
-                vector_size: 8
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts b/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts
index 09fd779..b3cf05b 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pIfaceCallback.vts
@@ -5,6 +5,7 @@
 package: "android.hardware.wifi.supplicant"
 
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -158,24 +159,24 @@
         name: "onDeviceFound"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 8
             vector_value: {
-                vector_size: 8
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -185,6 +186,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint16_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
         }
         arg: {
@@ -193,12 +195,13 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::P2pGroupCapabilityMask"
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 8
             vector_value: {
-                vector_size: 8
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -209,8 +212,8 @@
         name: "onDeviceLost"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -225,8 +228,8 @@
         name: "onGoNegotiationRequest"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -278,8 +281,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 32
             vector_value: {
-                vector_size: 32
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -289,8 +292,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -316,24 +319,24 @@
         name: "onInvitationReceived"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -352,8 +355,8 @@
         name: "onInvitationResult"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -368,8 +371,8 @@
         name: "onProvisionDiscoveryPbcRequest"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -380,8 +383,8 @@
         name: "onProvisionDiscoveryPbcResponse"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -392,8 +395,8 @@
         name: "onProvisionDiscoveryShowPin"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -407,8 +410,8 @@
         name: "onProvisionDiscoveryEnterPin"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -419,8 +422,8 @@
         name: "onProvisionDiscoveryFailure"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -431,8 +434,8 @@
         name: "onProvisionDiscoveryCompleted"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -447,6 +450,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint16_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
         }
         arg: {
@@ -458,8 +462,8 @@
         name: "onServiceDiscoveryResponse"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -481,16 +485,16 @@
         name: "onStaAuthorized"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -501,16 +505,16 @@
         name: "onStaDeauthorized"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts b/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts
index fddcca3..8d0b5a1 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pNetwork.vts
@@ -7,6 +7,7 @@
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantP2pNetworkCallback"
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     api: {
@@ -52,8 +53,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "ISupplicantP2pNetworkCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantP2pNetworkCallback"
         }
     }
 
@@ -80,8 +80,8 @@
         }
         return_type_hidl: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
diff --git a/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts b/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts
index 0e9ccde..9493c5e 100644
--- a/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantP2pNetworkCallback.vts
@@ -4,6 +4,7 @@
 
 package: "android.hardware.wifi.supplicant"
 
+import: "android.hidl.base@1.0::types"
 
 interface: {
 }
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaIface.vts b/wifi/supplicant/1.0/vts/SupplicantStaIface.vts
index ceadb6c..cc52487 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaIface.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaIface.vts
@@ -5,40 +5,13 @@
 package: "android.hardware.wifi.supplicant"
 
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantIface"
+import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantStaIfaceCallback"
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
-        name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantIface::ParamSizeLimits"
-        type: TYPE_ENUM
-        enum_value: {
-            scalar_type: "uint32_t"
-
-            enumerator: "WPS_DEVICE_NAME_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "WPS_MANUFACTURER_MAX_LEN"
-            scalar_value: {
-                uint32_t: 64
-            }
-            enumerator: "WPS_MODEL_NAME_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "WPS_MODEL_NUMBER_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-            enumerator: "WPS_SERIAL_NUMBER_MAX_LEN"
-            scalar_value: {
-                uint32_t: 32
-            }
-        }
-    }
-
-    attribute: {
         name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaIface::AnqpInfoId"
         type: TYPE_ENUM
         enum_value: {
@@ -134,6 +107,19 @@
         }
     }
 
+    attribute: {
+        name: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaIface::ExtRadioWorkDefaults"
+        type: TYPE_ENUM
+        enum_value: {
+            scalar_type: "uint32_t"
+
+            enumerator: "TIMEOUT_IN_SECS"
+            scalar_value: {
+                uint32_t: 10
+            }
+        }
+    }
+
     api: {
         name: "getName"
         return_type_hidl: {
@@ -165,8 +151,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantNetwork"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
         }
     }
 
@@ -190,8 +175,7 @@
         }
         return_type_hidl: {
             type: TYPE_HIDL_INTERFACE
-            predefined_type: "ISupplicantNetwork"
-            is_callback: false
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantNetwork"
         }
         arg: {
             type: TYPE_SCALAR
@@ -226,6 +210,22 @@
     }
 
     api: {
+        name: "setWpsDeviceType"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_ARRAY
+            vector_size: 8
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    api: {
         name: "setWpsManufacturer"
         return_type_hidl: {
             type: TYPE_STRUCT
@@ -277,6 +277,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint16_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::WpsConfigMethods"
         }
     }
@@ -289,8 +290,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "ISupplicantStaIfaceCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaIfaceCallback"
         }
     }
 
@@ -338,8 +338,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -354,8 +354,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -370,8 +370,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -386,8 +386,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -416,8 +416,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -435,8 +435,8 @@
         }
         return_type_hidl: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -527,8 +527,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 2
             vector_value: {
-                vector_size: 2
                 type: TYPE_SCALAR
                 scalar_type: "int8_t"
             }
@@ -543,8 +543,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -562,8 +562,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -592,8 +592,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -620,4 +620,39 @@
         }
     }
 
+    api: {
+        name: "addExtRadioWork"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        return_type_hidl: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        arg: {
+            type: TYPE_STRING
+        }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    api: {
+        name: "removeExtRadioWork"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
 }
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts b/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts
index 88b1c3b..0a35848 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaIfaceCallback.vts
@@ -5,6 +5,7 @@
 package: "android.hardware.wifi.supplicant"
 
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -305,8 +306,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -328,8 +329,8 @@
         name: "onAnqpQueryDone"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -348,8 +349,8 @@
         name: "onHs20IconQueryDone"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -396,8 +397,8 @@
         name: "onConnected"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -408,8 +409,8 @@
         name: "onDisconnected"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -428,8 +429,8 @@
         name: "onAssociationCompleted"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -440,8 +441,8 @@
         name: "onAssociationRejected"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -456,8 +457,8 @@
         name: "onAuthenticationTimeout"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -476,8 +477,8 @@
         name: "onWpsEventFail"
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -496,4 +497,20 @@
         name: "onWpsEventPbcOverlap"
     }
 
+    api: {
+        name: "onExtRadioWorkStart"
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    api: {
+        name: "onExtRadioWorkTimeout"
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
 }
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts b/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts
index f493b3e..8ad72f1 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaNetwork.vts
@@ -7,6 +7,7 @@
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantNetwork"
 import: "android.hardware.wifi.supplicant@1.0::ISupplicantStaNetworkCallback"
 import: "android.hardware.wifi.supplicant@1.0::types"
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -247,8 +248,8 @@
         struct_value: {
             name: "kc"
             type: TYPE_ARRAY
+            vector_size: 8
             vector_value: {
-                vector_size: 8
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -256,8 +257,8 @@
         struct_value: {
             name: "sres"
             type: TYPE_ARRAY
+            vector_size: 4
             vector_value: {
-                vector_size: 4
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -278,8 +279,8 @@
         struct_value: {
             name: "ik"
             type: TYPE_ARRAY
+            vector_size: 16
             vector_value: {
-                vector_size: 16
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -287,8 +288,8 @@
         struct_value: {
             name: "ck"
             type: TYPE_ARRAY
+            vector_size: 16
             vector_value: {
-                vector_size: 16
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -338,8 +339,7 @@
         }
         arg: {
             type: TYPE_HIDL_CALLBACK
-            predefined_type: "ISupplicantStaNetworkCallback"
-            is_callback: true
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetworkCallback"
         }
     }
 
@@ -366,8 +366,8 @@
         }
         arg: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -394,6 +394,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::KeyMgmtMask"
         }
     }
@@ -406,6 +407,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::ProtoMask"
         }
     }
@@ -418,6 +420,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::AuthAlgMask"
         }
     }
@@ -430,6 +433,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::GroupCipherMask"
         }
     }
@@ -442,6 +446,7 @@
         }
         arg: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::PairwiseCipherMask"
         }
     }
@@ -670,6 +675,18 @@
     }
 
     api: {
+        name: "setProactiveKeyCaching"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
+    api: {
         name: "setIdStr"
         return_type_hidl: {
             type: TYPE_STRUCT
@@ -681,6 +698,18 @@
     }
 
     api: {
+        name: "setUpdateIdentifier"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "uint32_t"
+        }
+    }
+
+    api: {
         name: "getSsid"
         return_type_hidl: {
             type: TYPE_STRUCT
@@ -703,8 +732,8 @@
         }
         return_type_hidl: {
             type: TYPE_ARRAY
+            vector_size: 6
             vector_value: {
-                vector_size: 6
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -731,6 +760,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::KeyMgmtMask"
         }
     }
@@ -743,6 +773,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::ProtoMask"
         }
     }
@@ -755,6 +786,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::AuthAlgMask"
         }
     }
@@ -767,6 +799,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::GroupCipherMask"
         }
     }
@@ -779,6 +812,7 @@
         }
         return_type_hidl: {
             type: TYPE_MASK
+            scalar_type: "uint32_t"
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::PairwiseCipherMask"
         }
     }
@@ -1052,8 +1086,19 @@
             predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
         }
         arg: {
+            type: TYPE_VECTOR
+            vector_value: {
+                type: TYPE_STRUCT
+                predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::NetworkResponseEapSimGsmAuthParams"
+            }
+        }
+    }
+
+    api: {
+        name: "sendNetworkEapSimGsmAuthFailure"
+        return_type_hidl: {
             type: TYPE_STRUCT
-            predefined_type: "::android::hardware::wifi::supplicant::V1_0::ISupplicantStaNetwork::NetworkResponseEapSimGsmAuthParams"
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
         }
     }
 
@@ -1070,6 +1115,30 @@
     }
 
     api: {
+        name: "sendNetworkEapSimUmtsAutsResponse"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+        arg: {
+            type: TYPE_ARRAY
+            vector_size: 14
+            vector_value: {
+                type: TYPE_SCALAR
+                scalar_type: "uint8_t"
+            }
+        }
+    }
+
+    api: {
+        name: "sendNetworkEapSimUmtsAuthFailure"
+        return_type_hidl: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::wifi::supplicant::V1_0::SupplicantStatus"
+        }
+    }
+
+    api: {
         name: "sendNetworkEapIdentityResponse"
         return_type_hidl: {
             type: TYPE_STRUCT
diff --git a/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts b/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts
index 3fe2da7..1c91d57 100644
--- a/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts
+++ b/wifi/supplicant/1.0/vts/SupplicantStaNetworkCallback.vts
@@ -4,6 +4,7 @@
 
 package: "android.hardware.wifi.supplicant"
 
+import: "android.hidl.base@1.0::types"
 
 interface: {
     attribute: {
@@ -14,8 +15,8 @@
             type: TYPE_VECTOR
             vector_value: {
                 type: TYPE_ARRAY
+                vector_size: 16
                 vector_value: {
-                    vector_size: 16
                     type: TYPE_SCALAR
                     scalar_type: "uint8_t"
                 }
@@ -29,8 +30,8 @@
         struct_value: {
             name: "rand"
             type: TYPE_ARRAY
+            vector_size: 16
             vector_value: {
-                vector_size: 16
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }
@@ -38,8 +39,8 @@
         struct_value: {
             name: "autn"
             type: TYPE_ARRAY
+            vector_size: 16
             vector_value: {
-                vector_size: 16
                 type: TYPE_SCALAR
                 scalar_type: "uint8_t"
             }