diff --git a/bluetooth/1.0/Android.mk b/bluetooth/1.0/Android.mk
index 887cbd6..7924cee 100644
--- a/bluetooth/1.0/Android.mk
+++ b/bluetooth/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (Status)
 #
-GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java
+GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build IBluetoothHci.hal
 #
-GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java
+GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
@@ -61,7 +61,7 @@
 #
 # Build IBluetoothHciCallbacks.hal
 #
-GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java
+GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal
@@ -98,7 +98,7 @@
 #
 # Build types.hal (Status)
 #
-GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java
+GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -117,7 +117,7 @@
 #
 # Build IBluetoothHci.hal
 #
-GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java
+GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
@@ -140,7 +140,7 @@
 #
 # Build IBluetoothHciCallbacks.hal
 #
-GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java
+GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal
diff --git a/boot/1.0/Android.mk b/boot/1.0/Android.mk
index cd7b9e5..6fa5e4b 100644
--- a/boot/1.0/Android.mk
+++ b/boot/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (BoolResult)
 #
-GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
+GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build types.hal (CommandResult)
 #
-GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
+GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@
 #
 # Build IBootControl.hal
 #
-GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
+GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
@@ -94,7 +94,7 @@
 #
 # Build types.hal (BoolResult)
 #
-GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
+GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -113,7 +113,7 @@
 #
 # Build types.hal (CommandResult)
 #
-GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
+GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -132,7 +132,7 @@
 #
 # Build IBootControl.hal
 #
-GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
+GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp
new file mode 100644
index 0000000..9badd6f
--- /dev/null
+++ b/ir/1.0/Android.bp
@@ -0,0 +1,56 @@
+// This file is autogenerated by hidl-gen. Do not edit manually.
+
+genrule {
+    name: "android.hardware.ir@1.0_genc++",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
+    srcs: [
+        "types.hal",
+        "IConsumerIr.hal",
+    ],
+    out: [
+        "android/hardware/ir/1.0/types.cpp",
+        "android/hardware/ir/1.0/ConsumerIrAll.cpp",
+    ],
+}
+
+genrule {
+    name: "android.hardware.ir@1.0_genc++_headers",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.ir@1.0",
+    srcs: [
+        "types.hal",
+        "IConsumerIr.hal",
+    ],
+    out: [
+        "android/hardware/ir/1.0/types.h",
+        "android/hardware/ir/1.0/IConsumerIr.h",
+        "android/hardware/ir/1.0/IHwConsumerIr.h",
+        "android/hardware/ir/1.0/BnConsumerIr.h",
+        "android/hardware/ir/1.0/BpConsumerIr.h",
+        "android/hardware/ir/1.0/BsConsumerIr.h",
+    ],
+}
+
+cc_library_shared {
+    name: "android.hardware.ir@1.0",
+    generated_sources: ["android.hardware.ir@1.0_genc++"],
+    generated_headers: ["android.hardware.ir@1.0_genc++_headers"],
+    export_generated_headers: ["android.hardware.ir@1.0_genc++_headers"],
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hidl.base@1.0",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hidl.base@1.0",
+    ],
+}
diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk
new file mode 100644
index 0000000..660b32b
--- /dev/null
+++ b/ir/1.0/Android.mk
@@ -0,0 +1,118 @@
+# This file is autogenerated by hidl-gen. Do not edit manually.
+
+LOCAL_PATH := $(call my-dir)
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.ir@1.0-java
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_JAVA_LIBRARIES := \
+    android.hidl.base@1.0-java \
+
+
+#
+# Build types.hal (ConsumerIrFreqRange)
+#
+GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        android.hardware.ir@1.0::types.ConsumerIrFreqRange
+
+$(GEN): $(LOCAL_PATH)/types.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IConsumerIr.hal
+#
+GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal
+$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
+$(GEN): $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        android.hardware.ir@1.0::IConsumerIr
+
+$(GEN): $(LOCAL_PATH)/IConsumerIr.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_JAVA_LIBRARY)
+
+
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.ir@1.0-java-static
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android.hidl.base@1.0-java-static \
+
+
+#
+# Build types.hal (ConsumerIrFreqRange)
+#
+GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        android.hardware.ir@1.0::types.ConsumerIrFreqRange
+
+$(GEN): $(LOCAL_PATH)/types.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build IConsumerIr.hal
+#
+GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal
+$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
+$(GEN): $(LOCAL_PATH)/types.hal
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+        -Ljava \
+        -randroid.hardware:hardware/interfaces \
+        -randroid.hidl:system/libhidl/transport \
+        android.hardware.ir@1.0::IConsumerIr
+
+$(GEN): $(LOCAL_PATH)/IConsumerIr.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/ir/1.0/IConsumerIr.hal b/ir/1.0/IConsumerIr.hal
new file mode 100644
index 0000000..f928c0e
--- /dev/null
+++ b/ir/1.0/IConsumerIr.hal
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.ir@1.0;
+
+interface IConsumerIr {
+    /*
+     * transmit() sends an IR pattern at a given carrierFreq.
+     *
+     * The pattern is alternating series of carrier on and off periods measured in
+     * microseconds. The carrier should be turned off at the end of a transmit
+     * even if there are and odd number of entries in the pattern array.
+     *
+     * This call must return when the transmit is complete or encounters an error.
+     *
+     * returns: true on success, false on error.
+     */
+    transmit(int32_t carrierFreq, vec<int32_t> pattern, int32_t patternLen) generates (bool success);
+
+    /*
+     * getCarrierFreqs() enumerates which frequencies the IR transmitter supports.
+     *
+     * returns: On success, true and a vector of all supported frequency
+     * ranges. On error, returns false.
+     */
+    getCarrierFreqs() generates (bool success, vec<ConsumerIrFreqRange> ranges);
+};
diff --git a/ir/1.0/default/Android.bp b/ir/1.0/default/Android.bp
new file mode 100644
index 0000000..7c441da
--- /dev/null
+++ b/ir/1.0/default/Android.bp
@@ -0,0 +1,46 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+cc_library_shared {
+    name: "android.hardware.ir@1.0-impl",
+    relative_install_path: "hw",
+    srcs: ["ConsumerIr.cpp"],
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhardware",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "android.hardware.ir@1.0",
+    ],
+}
+
+cc_binary {
+    relative_install_path: "hw",
+    name: "android.hardware.ir@1.0-service",
+    init_rc: ["android.hardware.ir@1.0-service.rc"],
+    srcs: ["service.cpp"],
+
+    shared_libs: [
+        "liblog",
+        "libhwbinder",
+        "libhardware",
+        "libhidlbase",
+        "libhidltransport",
+        "libutils",
+        "android.hardware.ir@1.0",
+    ],
+
+}
diff --git a/ir/1.0/default/ConsumerIr.cpp b/ir/1.0/default/ConsumerIr.cpp
new file mode 100644
index 0000000..763e09a
--- /dev/null
+++ b/ir/1.0/default/ConsumerIr.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "ConsumerIrService"
+#include <android/log.h>
+
+#include <hardware/hardware.h>
+#include <hardware/consumerir.h>
+#include "ConsumerIr.h"
+
+namespace android {
+namespace hardware {
+namespace ir {
+namespace V1_0 {
+namespace implementation {
+
+ConsumerIr::ConsumerIr(consumerir_device_t *device) {
+    mDevice = device;
+}
+
+// Methods from ::android::hardware::consumerir::V1_0::IConsumerIr follow.
+Return<bool> ConsumerIr::transmit(int32_t carrierFreq, const hidl_vec<int32_t>& pattern, int32_t patternLen) {
+    return mDevice->transmit(mDevice, carrierFreq, pattern.data(), patternLen) == 0;
+}
+
+Return<void> ConsumerIr::getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) {
+    int32_t len = mDevice->get_num_carrier_freqs(mDevice);
+    if (len < 0) {
+        _hidl_cb(false, {});
+        return Void();
+    }
+
+    consumerir_freq_range_t *rangeAr = new consumerir_freq_range_t[len];
+    bool success = (mDevice->get_carrier_freqs(mDevice, len, rangeAr) >= 0);
+    if (!success) {
+        _hidl_cb(false, {});
+        return Void();
+    }
+
+    hidl_vec<ConsumerIrFreqRange> rangeVec;
+    rangeVec.resize(len);
+    for (int32_t i = 0; i < len; i++) {
+        rangeVec[i].min = static_cast<uint32_t>(rangeAr[i].min);
+        rangeVec[i].max = static_cast<uint32_t>(rangeAr[i].max);
+    }
+    _hidl_cb(true, rangeVec);
+    return Void();
+}
+
+
+IConsumerIr* HIDL_FETCH_IConsumerIr(const char *name) {
+    consumerir_device_t *dev;
+    const hw_module_t *hw_module = NULL;
+
+    int ret = hw_get_module(name, &hw_module);
+    if (ret != 0) {
+        ALOGE("hw_get_module %s failed: %d", name, ret);
+        return nullptr;
+    }
+    ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &dev);
+    if (ret < 0) {
+        ALOGE("Can't open consumer IR transmitter, error: %d", ret);
+        return nullptr;
+    }
+    return new ConsumerIr(dev);
+}
+
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace ir
+}  // namespace hardware
+}  // namespace android
diff --git a/ir/1.0/default/ConsumerIr.h b/ir/1.0/default/ConsumerIr.h
new file mode 100644
index 0000000..527c577
--- /dev/null
+++ b/ir/1.0/default/ConsumerIr.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_HARDWARE_IR_V1_0_IR_H
+#define ANDROID_HARDWARE_IR_V1_0_IR_H
+
+#include <android/hardware/ir/1.0/IConsumerIr.h>
+#include <hardware/consumerir.h>
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+namespace android {
+namespace hardware {
+namespace ir {
+namespace V1_0 {
+namespace implementation {
+
+using ::android::hardware::ir::V1_0::ConsumerIrFreqRange;
+using ::android::hardware::ir::V1_0::IConsumerIr;
+using ::android::hardware::hidl_array;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+struct ConsumerIr : public IConsumerIr {
+    ConsumerIr(consumerir_device_t *device);
+    // Methods from ::android::hardware::ir::V1_0::IConsumerIr follow.
+    Return<bool> transmit(int32_t carrierFreq, const hidl_vec<int32_t>& pattern, int32_t patternLen) override;
+    Return<void> getCarrierFreqs(getCarrierFreqs_cb _hidl_cb) override;
+private:
+    consumerir_device_t *mDevice;
+};
+
+extern "C" IConsumerIr* HIDL_FETCH_IConsumerIr(const char* name);
+
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace ir
+}  // namespace hardware
+}  // namespace android
+
+#endif  // ANDROID_HARDWARE_IR_V1_0_IR_H
diff --git a/ir/1.0/default/android.hardware.ir@1.0-service.rc b/ir/1.0/default/android.hardware.ir@1.0-service.rc
new file mode 100644
index 0000000..5b05ba2
--- /dev/null
+++ b/ir/1.0/default/android.hardware.ir@1.0-service.rc
@@ -0,0 +1,4 @@
+service ir-hal-1-0 /system/bin/hw/android.hardware.ir@1.0-service
+    class hal
+    user system
+    group system
\ No newline at end of file
diff --git a/ir/1.0/default/service.cpp b/ir/1.0/default/service.cpp
new file mode 100644
index 0000000..237b2c9
--- /dev/null
+++ b/ir/1.0/default/service.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "android.hardware.ir@1.0-service"
+
+#include <android/hardware/ir/1.0/IConsumerIr.h>
+#include <hidl/LegacySupport.h>
+
+using android::hardware::ir::V1_0::IConsumerIr;
+using android::hardware::defaultPassthroughServiceImplementation;
+
+int main() {
+    return defaultPassthroughServiceImplementation<IConsumerIr>("consumerir");
+}
diff --git a/ir/1.0/types.hal b/ir/1.0/types.hal
new file mode 100644
index 0000000..9c65de6
--- /dev/null
+++ b/ir/1.0/types.hal
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.hardware.ir@1.0;
+
+struct ConsumerIrFreqRange {
+    uint32_t min;
+
+    uint32_t max;
+
+};
diff --git a/ir/Android.bp b/ir/Android.bp
new file mode 100644
index 0000000..ba90f2c
--- /dev/null
+++ b/ir/Android.bp
@@ -0,0 +1,5 @@
+// This is an autogenerated file, do not edit.
+subdirs = [
+    "1.0",
+    "1.0/default",
+]
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index f534944..823bde5 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (NfcEvent)
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build types.hal (NfcStatus)
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@
 #
 # Build INfc.hal
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
@@ -80,7 +80,7 @@
 #
 # Build INfcClientCallback.hal
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
@@ -117,7 +117,7 @@
 #
 # Build types.hal (NfcEvent)
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -136,7 +136,7 @@
 #
 # Build types.hal (NfcStatus)
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -155,7 +155,7 @@
 #
 # Build INfc.hal
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
@@ -178,7 +178,7 @@
 #
 # Build INfcClientCallback.hal
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
@@ -208,7 +208,7 @@
 
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 #
-GEN := $(intermediates)/android/hardware/nfc/1.0/Constants.java
+GEN := $(intermediates)/android/hardware/nfc/V1_0/Constants.java
 $(GEN): $(HIDL)
 $(GEN): $(LOCAL_PATH)/types.hal
 $(GEN): $(LOCAL_PATH)/INfc.hal
diff --git a/radio/1.0/Android.mk b/radio/1.0/Android.mk
index faed33a..c645657 100644
--- a/radio/1.0/Android.mk
+++ b/radio/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (ActivityStatsInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ActivityStatsInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ActivityStatsInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build types.hal (ApnAuthType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ApnAuthType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ApnAuthType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@
 #
 # Build types.hal (AppState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/AppState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/AppState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -76,7 +76,7 @@
 #
 # Build types.hal (AppStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/AppStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/AppStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -95,7 +95,7 @@
 #
 # Build types.hal (AppType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/AppType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/AppType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -114,7 +114,7 @@
 #
 # Build types.hal (Call)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Call.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Call.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -133,7 +133,7 @@
 #
 # Build types.hal (CallForwardInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -152,7 +152,7 @@
 #
 # Build types.hal (CallForwardInfoStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfoStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfoStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -171,7 +171,7 @@
 #
 # Build types.hal (CallPresentation)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallPresentation.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallPresentation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -190,7 +190,7 @@
 #
 # Build types.hal (CallState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -209,7 +209,7 @@
 #
 # Build types.hal (CardState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CardState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CardState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -228,7 +228,7 @@
 #
 # Build types.hal (CardStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CardStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CardStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -247,7 +247,7 @@
 #
 # Build types.hal (Carrier)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Carrier.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Carrier.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -266,7 +266,7 @@
 #
 # Build types.hal (CarrierMatchType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CarrierMatchType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierMatchType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -285,7 +285,7 @@
 #
 # Build types.hal (CarrierRestrictions)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CarrierRestrictions.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierRestrictions.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -304,7 +304,7 @@
 #
 # Build types.hal (CdmaBroadcastSmsConfigInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaBroadcastSmsConfigInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaBroadcastSmsConfigInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -323,7 +323,7 @@
 #
 # Build types.hal (CdmaCallWaiting)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaiting.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaiting.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -342,7 +342,7 @@
 #
 # Build types.hal (CdmaCallWaitingNumberPlan)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPlan.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPlan.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -361,7 +361,7 @@
 #
 # Build types.hal (CdmaCallWaitingNumberPresentation)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPresentation.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPresentation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -380,7 +380,7 @@
 #
 # Build types.hal (CdmaCallWaitingNumberType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -399,7 +399,7 @@
 #
 # Build types.hal (CdmaDisplayInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaDisplayInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaDisplayInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -418,7 +418,7 @@
 #
 # Build types.hal (CdmaInfoRecName)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInfoRecName.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInfoRecName.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -437,7 +437,7 @@
 #
 # Build types.hal (CdmaInformationRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -456,7 +456,7 @@
 #
 # Build types.hal (CdmaInformationRecords)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecords.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecords.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -475,7 +475,7 @@
 #
 # Build types.hal (CdmaLineControlInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaLineControlInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaLineControlInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -494,7 +494,7 @@
 #
 # Build types.hal (CdmaNumberInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaNumberInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaNumberInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -513,7 +513,7 @@
 #
 # Build types.hal (CdmaOtaProvisionStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaOtaProvisionStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaOtaProvisionStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -532,7 +532,7 @@
 #
 # Build types.hal (CdmaRedirectingNumberInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingNumberInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingNumberInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -551,7 +551,7 @@
 #
 # Build types.hal (CdmaRedirectingReason)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingReason.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingReason.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -570,7 +570,7 @@
 #
 # Build types.hal (CdmaRoamingType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRoamingType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRoamingType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -589,7 +589,7 @@
 #
 # Build types.hal (CdmaSignalInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -608,7 +608,7 @@
 #
 # Build types.hal (CdmaSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -627,7 +627,7 @@
 #
 # Build types.hal (CdmaSmsAck)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAck.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAck.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -646,7 +646,7 @@
 #
 # Build types.hal (CdmaSmsAddress)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAddress.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAddress.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -665,7 +665,7 @@
 #
 # Build types.hal (CdmaSmsDigitMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsDigitMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsDigitMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -684,7 +684,7 @@
 #
 # Build types.hal (CdmaSmsErrorClass)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsErrorClass.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsErrorClass.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -703,7 +703,7 @@
 #
 # Build types.hal (CdmaSmsMessage)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsMessage.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsMessage.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -722,7 +722,7 @@
 #
 # Build types.hal (CdmaSmsNumberMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -741,7 +741,7 @@
 #
 # Build types.hal (CdmaSmsNumberPlan)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberPlan.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberPlan.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -760,7 +760,7 @@
 #
 # Build types.hal (CdmaSmsNumberType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -779,7 +779,7 @@
 #
 # Build types.hal (CdmaSmsSubaddress)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddress.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddress.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -798,7 +798,7 @@
 #
 # Build types.hal (CdmaSmsSubaddressType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddressType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddressType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -817,7 +817,7 @@
 #
 # Build types.hal (CdmaSmsWriteArgs)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgs.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgs.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -836,7 +836,7 @@
 #
 # Build types.hal (CdmaSmsWriteArgsStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgsStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgsStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -855,7 +855,7 @@
 #
 # Build types.hal (CdmaSubscriptionSource)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSubscriptionSource.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSubscriptionSource.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -874,7 +874,7 @@
 #
 # Build types.hal (CdmaT53AudioControlInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53AudioControlInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53AudioControlInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -893,7 +893,7 @@
 #
 # Build types.hal (CdmaT53ClirInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53ClirInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53ClirInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -912,7 +912,7 @@
 #
 # Build types.hal (CellIdentityCdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityCdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityCdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -931,7 +931,7 @@
 #
 # Build types.hal (CellIdentityGsm)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityGsm.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityGsm.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -950,7 +950,7 @@
 #
 # Build types.hal (CellIdentityLte)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityLte.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityLte.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -969,7 +969,7 @@
 #
 # Build types.hal (CellIdentityTdscdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityTdscdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityTdscdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -988,7 +988,7 @@
 #
 # Build types.hal (CellIdentityWcdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityWcdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityWcdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1007,7 +1007,7 @@
 #
 # Build types.hal (CellInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1026,7 +1026,7 @@
 #
 # Build types.hal (CellInfoCdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoCdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoCdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1045,7 +1045,7 @@
 #
 # Build types.hal (CellInfoGsm)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoGsm.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoGsm.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1064,7 +1064,7 @@
 #
 # Build types.hal (CellInfoLte)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoLte.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoLte.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1083,7 +1083,7 @@
 #
 # Build types.hal (CellInfoTdscdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoTdscdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoTdscdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1102,7 +1102,7 @@
 #
 # Build types.hal (CellInfoType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1121,7 +1121,7 @@
 #
 # Build types.hal (CellInfoWcdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoWcdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoWcdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1140,7 +1140,7 @@
 #
 # Build types.hal (CfData)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CfData.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CfData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1159,7 +1159,7 @@
 #
 # Build types.hal (ClipStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ClipStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ClipStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1178,7 +1178,7 @@
 #
 # Build types.hal (Clir)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Clir.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Clir.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1197,7 +1197,7 @@
 #
 # Build types.hal (DataCallFailCause)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataCallFailCause.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataCallFailCause.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1216,7 +1216,7 @@
 #
 # Build types.hal (DataProfile)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataProfile.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfile.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1235,7 +1235,7 @@
 #
 # Build types.hal (DataProfileInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1254,7 +1254,7 @@
 #
 # Build types.hal (DataProfileInfoType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfoType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfoType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1273,7 +1273,7 @@
 #
 # Build types.hal (DataRegStateResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataRegStateResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataRegStateResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1292,7 +1292,7 @@
 #
 # Build types.hal (Dial)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Dial.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Dial.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1311,7 +1311,7 @@
 #
 # Build types.hal (EvdoSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/EvdoSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/EvdoSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1330,7 +1330,7 @@
 #
 # Build types.hal (GsmBroadcastSmsConfigInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/GsmBroadcastSmsConfigInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/GsmBroadcastSmsConfigInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1349,7 +1349,7 @@
 #
 # Build types.hal (GsmSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/GsmSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1368,7 +1368,7 @@
 #
 # Build types.hal (GsmSmsMessage)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/GsmSmsMessage.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSmsMessage.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1387,7 +1387,7 @@
 #
 # Build types.hal (HardwareConfig)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfig.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfig.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1406,7 +1406,7 @@
 #
 # Build types.hal (HardwareConfigModem)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigModem.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigModem.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1425,7 +1425,7 @@
 #
 # Build types.hal (HardwareConfigSim)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigSim.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigSim.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1444,7 +1444,7 @@
 #
 # Build types.hal (HardwareConfigState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1463,7 +1463,7 @@
 #
 # Build types.hal (HardwareConfigType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1482,7 +1482,7 @@
 #
 # Build types.hal (IccIo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IccIo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IccIo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1501,7 +1501,7 @@
 #
 # Build types.hal (IccIoResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IccIoResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IccIoResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1520,7 +1520,7 @@
 #
 # Build types.hal (ImsSmsMessage)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ImsSmsMessage.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ImsSmsMessage.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1539,7 +1539,7 @@
 #
 # Build types.hal (LastCallFailCause)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LastCallFailCause.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCause.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1558,7 +1558,7 @@
 #
 # Build types.hal (LceDataInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LceDataInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LceDataInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1577,7 +1577,7 @@
 #
 # Build types.hal (LceStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LceStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1596,7 +1596,7 @@
 #
 # Build types.hal (LceStatusInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LceStatusInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatusInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1615,7 +1615,7 @@
 #
 # Build types.hal (LteSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LteSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LteSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1634,7 +1634,7 @@
 #
 # Build types.hal (NeighboringCell)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/NeighboringCell.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/NeighboringCell.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1653,7 +1653,7 @@
 #
 # Build types.hal (NvItem)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/NvItem.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/NvItem.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1672,7 +1672,7 @@
 #
 # Build types.hal (NvWriteItem)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/NvWriteItem.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/NvWriteItem.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1691,7 +1691,7 @@
 #
 # Build types.hal (OperatorInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/OperatorInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1710,7 +1710,7 @@
 #
 # Build types.hal (OperatorStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/OperatorStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1729,7 +1729,7 @@
 #
 # Build types.hal (PcoDataInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PcoDataInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PcoDataInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1748,7 +1748,7 @@
 #
 # Build types.hal (PersoSubstate)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PersoSubstate.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PersoSubstate.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1767,7 +1767,7 @@
 #
 # Build types.hal (PhoneRestrictedState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PhoneRestrictedState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PhoneRestrictedState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1786,7 +1786,7 @@
 #
 # Build types.hal (PinState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PinState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PinState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1805,7 +1805,7 @@
 #
 # Build types.hal (PreferredNetworkType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PreferredNetworkType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PreferredNetworkType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1824,7 +1824,7 @@
 #
 # Build types.hal (RadioAccessFamily)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioAccessFamily.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioAccessFamily.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1843,7 +1843,7 @@
 #
 # Build types.hal (RadioBandMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioBandMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioBandMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1862,7 +1862,7 @@
 #
 # Build types.hal (RadioCapability)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapability.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapability.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1881,7 +1881,7 @@
 #
 # Build types.hal (RadioCapabilityPhase)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityPhase.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityPhase.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1900,7 +1900,7 @@
 #
 # Build types.hal (RadioCapabilityStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1919,7 +1919,7 @@
 #
 # Build types.hal (RadioCdmaSmsConst)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCdmaSmsConst.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCdmaSmsConst.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1938,7 +1938,7 @@
 #
 # Build types.hal (RadioConst)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioConst.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioConst.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1957,7 +1957,7 @@
 #
 # Build types.hal (RadioError)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioError.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioError.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1976,7 +1976,7 @@
 #
 # Build types.hal (RadioIndicationType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioIndicationType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioIndicationType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1995,7 +1995,7 @@
 #
 # Build types.hal (RadioResponseInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2014,7 +2014,7 @@
 #
 # Build types.hal (RadioResponseType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2033,7 +2033,7 @@
 #
 # Build types.hal (RadioState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2052,7 +2052,7 @@
 #
 # Build types.hal (RadioTechnology)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnology.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnology.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2071,7 +2071,7 @@
 #
 # Build types.hal (RadioTechnologyFamily)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnologyFamily.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnologyFamily.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2090,7 +2090,7 @@
 #
 # Build types.hal (RegState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RegState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RegState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2109,7 +2109,7 @@
 #
 # Build types.hal (ResetNvType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ResetNvType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ResetNvType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2128,7 +2128,7 @@
 #
 # Build types.hal (RestrictedState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RestrictedState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RestrictedState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2147,7 +2147,7 @@
 #
 # Build types.hal (SapApduType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapApduType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapApduType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2166,7 +2166,7 @@
 #
 # Build types.hal (SapConnectRsp)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapConnectRsp.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapConnectRsp.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2185,7 +2185,7 @@
 #
 # Build types.hal (SapDisconnectType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapDisconnectType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapDisconnectType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2204,7 +2204,7 @@
 #
 # Build types.hal (SapResultCode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapResultCode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapResultCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2223,7 +2223,7 @@
 #
 # Build types.hal (SapStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2242,7 +2242,7 @@
 #
 # Build types.hal (SapTransferProtocol)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapTransferProtocol.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapTransferProtocol.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2261,7 +2261,7 @@
 #
 # Build types.hal (SelectUiccSub)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SelectUiccSub.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SelectUiccSub.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2280,7 +2280,7 @@
 #
 # Build types.hal (SendSmsResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SendSmsResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SendSmsResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2299,7 +2299,7 @@
 #
 # Build types.hal (SetupDataCallResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SetupDataCallResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SetupDataCallResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2318,7 +2318,7 @@
 #
 # Build types.hal (SignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2337,7 +2337,7 @@
 #
 # Build types.hal (SimApdu)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SimApdu.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SimApdu.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2356,7 +2356,7 @@
 #
 # Build types.hal (SimRefreshResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2375,7 +2375,7 @@
 #
 # Build types.hal (SimRefreshType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2394,7 +2394,7 @@
 #
 # Build types.hal (SmsAcknowledgeFailCause)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SmsAcknowledgeFailCause.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SmsAcknowledgeFailCause.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2413,7 +2413,7 @@
 #
 # Build types.hal (SmsWriteArgs)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgs.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgs.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2432,7 +2432,7 @@
 #
 # Build types.hal (SmsWriteArgsStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgsStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgsStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2451,7 +2451,7 @@
 #
 # Build types.hal (SrvccState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SrvccState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SrvccState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2470,7 +2470,7 @@
 #
 # Build types.hal (SsInfoData)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsInfoData.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsInfoData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2489,7 +2489,7 @@
 #
 # Build types.hal (SsRequestType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsRequestType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsRequestType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2508,7 +2508,7 @@
 #
 # Build types.hal (SsServiceType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsServiceType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsServiceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2527,7 +2527,7 @@
 #
 # Build types.hal (SsTeleserviceType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsTeleserviceType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsTeleserviceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2546,7 +2546,7 @@
 #
 # Build types.hal (StkCcUnsolSsResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/StkCcUnsolSsResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/StkCcUnsolSsResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2565,7 +2565,7 @@
 #
 # Build types.hal (SubscriptionType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SubscriptionType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SubscriptionType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2584,7 +2584,7 @@
 #
 # Build types.hal (SuppServiceClass)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SuppServiceClass.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SuppServiceClass.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2603,7 +2603,7 @@
 #
 # Build types.hal (SuppSvcNotification)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SuppSvcNotification.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SuppSvcNotification.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2622,7 +2622,7 @@
 #
 # Build types.hal (TdScdmaSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/TdScdmaSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/TdScdmaSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2641,7 +2641,7 @@
 #
 # Build types.hal (TimeStampType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/TimeStampType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/TimeStampType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2660,7 +2660,7 @@
 #
 # Build types.hal (TtyMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/TtyMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/TtyMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2679,7 +2679,7 @@
 #
 # Build types.hal (UiccSubActStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UiccSubActStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UiccSubActStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2698,7 +2698,7 @@
 #
 # Build types.hal (UssdModeType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UssdModeType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UssdModeType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2717,7 +2717,7 @@
 #
 # Build types.hal (UusDcs)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UusDcs.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UusDcs.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2736,7 +2736,7 @@
 #
 # Build types.hal (UusInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UusInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UusInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2755,7 +2755,7 @@
 #
 # Build types.hal (UusType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UusType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UusType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2774,7 +2774,7 @@
 #
 # Build types.hal (VoiceRegStateResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/VoiceRegStateResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/VoiceRegStateResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2793,7 +2793,7 @@
 #
 # Build types.hal (WcdmaSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/WcdmaSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/WcdmaSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2812,7 +2812,7 @@
 #
 # Build IRadio.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IRadio.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IRadio.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal
@@ -2837,7 +2837,7 @@
 #
 # Build IRadioIndication.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IRadioIndication.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioIndication.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal
@@ -2858,7 +2858,7 @@
 #
 # Build IRadioResponse.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IRadioResponse.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal
@@ -2879,7 +2879,7 @@
 #
 # Build ISap.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ISap.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ISap.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISap.hal
@@ -2902,7 +2902,7 @@
 #
 # Build ISapCallback.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ISapCallback.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ISapCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISapCallback.hal
@@ -2939,7 +2939,7 @@
 #
 # Build types.hal (ActivityStatsInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ActivityStatsInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ActivityStatsInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2958,7 +2958,7 @@
 #
 # Build types.hal (ApnAuthType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ApnAuthType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ApnAuthType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2977,7 +2977,7 @@
 #
 # Build types.hal (AppState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/AppState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/AppState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2996,7 +2996,7 @@
 #
 # Build types.hal (AppStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/AppStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/AppStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3015,7 +3015,7 @@
 #
 # Build types.hal (AppType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/AppType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/AppType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3034,7 +3034,7 @@
 #
 # Build types.hal (Call)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Call.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Call.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3053,7 +3053,7 @@
 #
 # Build types.hal (CallForwardInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3072,7 +3072,7 @@
 #
 # Build types.hal (CallForwardInfoStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfoStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfoStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3091,7 +3091,7 @@
 #
 # Build types.hal (CallPresentation)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallPresentation.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallPresentation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3110,7 +3110,7 @@
 #
 # Build types.hal (CallState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CallState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CallState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3129,7 +3129,7 @@
 #
 # Build types.hal (CardState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CardState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CardState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3148,7 +3148,7 @@
 #
 # Build types.hal (CardStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CardStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CardStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3167,7 +3167,7 @@
 #
 # Build types.hal (Carrier)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Carrier.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Carrier.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3186,7 +3186,7 @@
 #
 # Build types.hal (CarrierMatchType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CarrierMatchType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierMatchType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3205,7 +3205,7 @@
 #
 # Build types.hal (CarrierRestrictions)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CarrierRestrictions.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierRestrictions.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3224,7 +3224,7 @@
 #
 # Build types.hal (CdmaBroadcastSmsConfigInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaBroadcastSmsConfigInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaBroadcastSmsConfigInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3243,7 +3243,7 @@
 #
 # Build types.hal (CdmaCallWaiting)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaiting.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaiting.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3262,7 +3262,7 @@
 #
 # Build types.hal (CdmaCallWaitingNumberPlan)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPlan.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPlan.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3281,7 +3281,7 @@
 #
 # Build types.hal (CdmaCallWaitingNumberPresentation)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPresentation.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPresentation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3300,7 +3300,7 @@
 #
 # Build types.hal (CdmaCallWaitingNumberType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3319,7 +3319,7 @@
 #
 # Build types.hal (CdmaDisplayInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaDisplayInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaDisplayInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3338,7 +3338,7 @@
 #
 # Build types.hal (CdmaInfoRecName)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInfoRecName.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInfoRecName.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3357,7 +3357,7 @@
 #
 # Build types.hal (CdmaInformationRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3376,7 +3376,7 @@
 #
 # Build types.hal (CdmaInformationRecords)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecords.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecords.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3395,7 +3395,7 @@
 #
 # Build types.hal (CdmaLineControlInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaLineControlInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaLineControlInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3414,7 +3414,7 @@
 #
 # Build types.hal (CdmaNumberInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaNumberInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaNumberInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3433,7 +3433,7 @@
 #
 # Build types.hal (CdmaOtaProvisionStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaOtaProvisionStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaOtaProvisionStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3452,7 +3452,7 @@
 #
 # Build types.hal (CdmaRedirectingNumberInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingNumberInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingNumberInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3471,7 +3471,7 @@
 #
 # Build types.hal (CdmaRedirectingReason)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingReason.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingReason.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3490,7 +3490,7 @@
 #
 # Build types.hal (CdmaRoamingType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRoamingType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRoamingType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3509,7 +3509,7 @@
 #
 # Build types.hal (CdmaSignalInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3528,7 +3528,7 @@
 #
 # Build types.hal (CdmaSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3547,7 +3547,7 @@
 #
 # Build types.hal (CdmaSmsAck)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAck.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAck.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3566,7 +3566,7 @@
 #
 # Build types.hal (CdmaSmsAddress)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAddress.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAddress.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3585,7 +3585,7 @@
 #
 # Build types.hal (CdmaSmsDigitMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsDigitMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsDigitMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3604,7 +3604,7 @@
 #
 # Build types.hal (CdmaSmsErrorClass)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsErrorClass.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsErrorClass.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3623,7 +3623,7 @@
 #
 # Build types.hal (CdmaSmsMessage)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsMessage.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsMessage.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3642,7 +3642,7 @@
 #
 # Build types.hal (CdmaSmsNumberMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3661,7 +3661,7 @@
 #
 # Build types.hal (CdmaSmsNumberPlan)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberPlan.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberPlan.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3680,7 +3680,7 @@
 #
 # Build types.hal (CdmaSmsNumberType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3699,7 +3699,7 @@
 #
 # Build types.hal (CdmaSmsSubaddress)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddress.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddress.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3718,7 +3718,7 @@
 #
 # Build types.hal (CdmaSmsSubaddressType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddressType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddressType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3737,7 +3737,7 @@
 #
 # Build types.hal (CdmaSmsWriteArgs)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgs.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgs.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3756,7 +3756,7 @@
 #
 # Build types.hal (CdmaSmsWriteArgsStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgsStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgsStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3775,7 +3775,7 @@
 #
 # Build types.hal (CdmaSubscriptionSource)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSubscriptionSource.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSubscriptionSource.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3794,7 +3794,7 @@
 #
 # Build types.hal (CdmaT53AudioControlInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53AudioControlInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53AudioControlInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3813,7 +3813,7 @@
 #
 # Build types.hal (CdmaT53ClirInfoRecord)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53ClirInfoRecord.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53ClirInfoRecord.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3832,7 +3832,7 @@
 #
 # Build types.hal (CellIdentityCdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityCdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityCdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3851,7 +3851,7 @@
 #
 # Build types.hal (CellIdentityGsm)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityGsm.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityGsm.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3870,7 +3870,7 @@
 #
 # Build types.hal (CellIdentityLte)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityLte.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityLte.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3889,7 +3889,7 @@
 #
 # Build types.hal (CellIdentityTdscdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityTdscdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityTdscdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3908,7 +3908,7 @@
 #
 # Build types.hal (CellIdentityWcdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityWcdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityWcdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3927,7 +3927,7 @@
 #
 # Build types.hal (CellInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3946,7 +3946,7 @@
 #
 # Build types.hal (CellInfoCdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoCdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoCdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3965,7 +3965,7 @@
 #
 # Build types.hal (CellInfoGsm)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoGsm.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoGsm.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3984,7 +3984,7 @@
 #
 # Build types.hal (CellInfoLte)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoLte.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoLte.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4003,7 +4003,7 @@
 #
 # Build types.hal (CellInfoTdscdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoTdscdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoTdscdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4022,7 +4022,7 @@
 #
 # Build types.hal (CellInfoType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4041,7 +4041,7 @@
 #
 # Build types.hal (CellInfoWcdma)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoWcdma.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoWcdma.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4060,7 +4060,7 @@
 #
 # Build types.hal (CfData)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/CfData.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/CfData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4079,7 +4079,7 @@
 #
 # Build types.hal (ClipStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ClipStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ClipStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4098,7 +4098,7 @@
 #
 # Build types.hal (Clir)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Clir.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Clir.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4117,7 +4117,7 @@
 #
 # Build types.hal (DataCallFailCause)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataCallFailCause.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataCallFailCause.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4136,7 +4136,7 @@
 #
 # Build types.hal (DataProfile)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataProfile.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfile.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4155,7 +4155,7 @@
 #
 # Build types.hal (DataProfileInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4174,7 +4174,7 @@
 #
 # Build types.hal (DataProfileInfoType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfoType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfoType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4193,7 +4193,7 @@
 #
 # Build types.hal (DataRegStateResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/DataRegStateResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/DataRegStateResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4212,7 +4212,7 @@
 #
 # Build types.hal (Dial)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/Dial.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/Dial.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4231,7 +4231,7 @@
 #
 # Build types.hal (EvdoSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/EvdoSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/EvdoSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4250,7 +4250,7 @@
 #
 # Build types.hal (GsmBroadcastSmsConfigInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/GsmBroadcastSmsConfigInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/GsmBroadcastSmsConfigInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4269,7 +4269,7 @@
 #
 # Build types.hal (GsmSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/GsmSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4288,7 +4288,7 @@
 #
 # Build types.hal (GsmSmsMessage)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/GsmSmsMessage.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSmsMessage.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4307,7 +4307,7 @@
 #
 # Build types.hal (HardwareConfig)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfig.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfig.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4326,7 +4326,7 @@
 #
 # Build types.hal (HardwareConfigModem)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigModem.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigModem.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4345,7 +4345,7 @@
 #
 # Build types.hal (HardwareConfigSim)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigSim.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigSim.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4364,7 +4364,7 @@
 #
 # Build types.hal (HardwareConfigState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4383,7 +4383,7 @@
 #
 # Build types.hal (HardwareConfigType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4402,7 +4402,7 @@
 #
 # Build types.hal (IccIo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IccIo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IccIo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4421,7 +4421,7 @@
 #
 # Build types.hal (IccIoResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IccIoResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IccIoResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4440,7 +4440,7 @@
 #
 # Build types.hal (ImsSmsMessage)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ImsSmsMessage.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ImsSmsMessage.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4459,7 +4459,7 @@
 #
 # Build types.hal (LastCallFailCause)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LastCallFailCause.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCause.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4478,7 +4478,7 @@
 #
 # Build types.hal (LceDataInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LceDataInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LceDataInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4497,7 +4497,7 @@
 #
 # Build types.hal (LceStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LceStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4516,7 +4516,7 @@
 #
 # Build types.hal (LceStatusInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LceStatusInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatusInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4535,7 +4535,7 @@
 #
 # Build types.hal (LteSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/LteSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/LteSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4554,7 +4554,7 @@
 #
 # Build types.hal (NeighboringCell)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/NeighboringCell.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/NeighboringCell.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4573,7 +4573,7 @@
 #
 # Build types.hal (NvItem)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/NvItem.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/NvItem.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4592,7 +4592,7 @@
 #
 # Build types.hal (NvWriteItem)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/NvWriteItem.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/NvWriteItem.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4611,7 +4611,7 @@
 #
 # Build types.hal (OperatorInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/OperatorInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4630,7 +4630,7 @@
 #
 # Build types.hal (OperatorStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/OperatorStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4649,7 +4649,7 @@
 #
 # Build types.hal (PcoDataInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PcoDataInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PcoDataInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4668,7 +4668,7 @@
 #
 # Build types.hal (PersoSubstate)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PersoSubstate.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PersoSubstate.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4687,7 +4687,7 @@
 #
 # Build types.hal (PhoneRestrictedState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PhoneRestrictedState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PhoneRestrictedState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4706,7 +4706,7 @@
 #
 # Build types.hal (PinState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PinState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PinState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4725,7 +4725,7 @@
 #
 # Build types.hal (PreferredNetworkType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/PreferredNetworkType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/PreferredNetworkType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4744,7 +4744,7 @@
 #
 # Build types.hal (RadioAccessFamily)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioAccessFamily.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioAccessFamily.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4763,7 +4763,7 @@
 #
 # Build types.hal (RadioBandMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioBandMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioBandMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4782,7 +4782,7 @@
 #
 # Build types.hal (RadioCapability)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapability.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapability.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4801,7 +4801,7 @@
 #
 # Build types.hal (RadioCapabilityPhase)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityPhase.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityPhase.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4820,7 +4820,7 @@
 #
 # Build types.hal (RadioCapabilityStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4839,7 +4839,7 @@
 #
 # Build types.hal (RadioCdmaSmsConst)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioCdmaSmsConst.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCdmaSmsConst.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4858,7 +4858,7 @@
 #
 # Build types.hal (RadioConst)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioConst.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioConst.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4877,7 +4877,7 @@
 #
 # Build types.hal (RadioError)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioError.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioError.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4896,7 +4896,7 @@
 #
 # Build types.hal (RadioIndicationType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioIndicationType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioIndicationType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4915,7 +4915,7 @@
 #
 # Build types.hal (RadioResponseInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4934,7 +4934,7 @@
 #
 # Build types.hal (RadioResponseType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4953,7 +4953,7 @@
 #
 # Build types.hal (RadioState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4972,7 +4972,7 @@
 #
 # Build types.hal (RadioTechnology)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnology.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnology.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4991,7 +4991,7 @@
 #
 # Build types.hal (RadioTechnologyFamily)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnologyFamily.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnologyFamily.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5010,7 +5010,7 @@
 #
 # Build types.hal (RegState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RegState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RegState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5029,7 +5029,7 @@
 #
 # Build types.hal (ResetNvType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ResetNvType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ResetNvType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5048,7 +5048,7 @@
 #
 # Build types.hal (RestrictedState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/RestrictedState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/RestrictedState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5067,7 +5067,7 @@
 #
 # Build types.hal (SapApduType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapApduType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapApduType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5086,7 +5086,7 @@
 #
 # Build types.hal (SapConnectRsp)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapConnectRsp.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapConnectRsp.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5105,7 +5105,7 @@
 #
 # Build types.hal (SapDisconnectType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapDisconnectType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapDisconnectType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5124,7 +5124,7 @@
 #
 # Build types.hal (SapResultCode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapResultCode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapResultCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5143,7 +5143,7 @@
 #
 # Build types.hal (SapStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5162,7 +5162,7 @@
 #
 # Build types.hal (SapTransferProtocol)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SapTransferProtocol.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SapTransferProtocol.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5181,7 +5181,7 @@
 #
 # Build types.hal (SelectUiccSub)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SelectUiccSub.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SelectUiccSub.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5200,7 +5200,7 @@
 #
 # Build types.hal (SendSmsResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SendSmsResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SendSmsResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5219,7 +5219,7 @@
 #
 # Build types.hal (SetupDataCallResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SetupDataCallResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SetupDataCallResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5238,7 +5238,7 @@
 #
 # Build types.hal (SignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5257,7 +5257,7 @@
 #
 # Build types.hal (SimApdu)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SimApdu.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SimApdu.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5276,7 +5276,7 @@
 #
 # Build types.hal (SimRefreshResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5295,7 +5295,7 @@
 #
 # Build types.hal (SimRefreshType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5314,7 +5314,7 @@
 #
 # Build types.hal (SmsAcknowledgeFailCause)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SmsAcknowledgeFailCause.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SmsAcknowledgeFailCause.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5333,7 +5333,7 @@
 #
 # Build types.hal (SmsWriteArgs)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgs.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgs.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5352,7 +5352,7 @@
 #
 # Build types.hal (SmsWriteArgsStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgsStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgsStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5371,7 +5371,7 @@
 #
 # Build types.hal (SrvccState)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SrvccState.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SrvccState.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5390,7 +5390,7 @@
 #
 # Build types.hal (SsInfoData)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsInfoData.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsInfoData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5409,7 +5409,7 @@
 #
 # Build types.hal (SsRequestType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsRequestType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsRequestType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5428,7 +5428,7 @@
 #
 # Build types.hal (SsServiceType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsServiceType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsServiceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5447,7 +5447,7 @@
 #
 # Build types.hal (SsTeleserviceType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SsTeleserviceType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SsTeleserviceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5466,7 +5466,7 @@
 #
 # Build types.hal (StkCcUnsolSsResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/StkCcUnsolSsResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/StkCcUnsolSsResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5485,7 +5485,7 @@
 #
 # Build types.hal (SubscriptionType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SubscriptionType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SubscriptionType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5504,7 +5504,7 @@
 #
 # Build types.hal (SuppServiceClass)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SuppServiceClass.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SuppServiceClass.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5523,7 +5523,7 @@
 #
 # Build types.hal (SuppSvcNotification)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/SuppSvcNotification.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/SuppSvcNotification.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5542,7 +5542,7 @@
 #
 # Build types.hal (TdScdmaSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/TdScdmaSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/TdScdmaSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5561,7 +5561,7 @@
 #
 # Build types.hal (TimeStampType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/TimeStampType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/TimeStampType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5580,7 +5580,7 @@
 #
 # Build types.hal (TtyMode)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/TtyMode.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/TtyMode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5599,7 +5599,7 @@
 #
 # Build types.hal (UiccSubActStatus)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UiccSubActStatus.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UiccSubActStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5618,7 +5618,7 @@
 #
 # Build types.hal (UssdModeType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UssdModeType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UssdModeType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5637,7 +5637,7 @@
 #
 # Build types.hal (UusDcs)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UusDcs.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UusDcs.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5656,7 +5656,7 @@
 #
 # Build types.hal (UusInfo)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UusInfo.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UusInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5675,7 +5675,7 @@
 #
 # Build types.hal (UusType)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/UusType.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/UusType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5694,7 +5694,7 @@
 #
 # Build types.hal (VoiceRegStateResult)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/VoiceRegStateResult.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/VoiceRegStateResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5713,7 +5713,7 @@
 #
 # Build types.hal (WcdmaSignalStrength)
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/WcdmaSignalStrength.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/WcdmaSignalStrength.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -5732,7 +5732,7 @@
 #
 # Build IRadio.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IRadio.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IRadio.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal
@@ -5757,7 +5757,7 @@
 #
 # Build IRadioIndication.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IRadioIndication.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioIndication.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal
@@ -5778,7 +5778,7 @@
 #
 # Build IRadioResponse.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/IRadioResponse.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal
@@ -5799,7 +5799,7 @@
 #
 # Build ISap.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ISap.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ISap.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISap.hal
@@ -5822,7 +5822,7 @@
 #
 # Build ISapCallback.hal
 #
-GEN := $(intermediates)/android/hardware/radio/1.0/ISapCallback.java
+GEN := $(intermediates)/android/hardware/radio/V1_0/ISapCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISapCallback.hal
diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index a27de71..82ba3cb 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build IBase.hal
 #
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
+GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBase.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
@@ -38,7 +38,7 @@
 #
 # Build IBaz.hal
 #
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
+GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBaz.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
@@ -61,7 +61,7 @@
 #
 # Build IBazCallback.hal
 #
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBazCallback.java
+GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBazCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
@@ -96,7 +96,7 @@
 #
 # Build IBase.hal
 #
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
+GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBase.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
@@ -115,7 +115,7 @@
 #
 # Build IBaz.hal
 #
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
+GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBaz.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
@@ -138,7 +138,7 @@
 #
 # Build IBazCallback.hal
 #
-GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBazCallback.java
+GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBazCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
diff --git a/tests/baz/1.0/IBaz.hal b/tests/baz/1.0/IBaz.hal
index c8fe2b6..3e1e2b9 100644
--- a/tests/baz/1.0/IBaz.hal
+++ b/tests/baz/1.0/IBaz.hal
@@ -55,4 +55,8 @@
     haveAStringVec(vec<string> vector) generates (vec<string> result);
 
     returnABunchOfStrings() generates (string a, string b, string c);
+
+    returnABitField() generates (bitfield<BitField> good);
+
+    size(uint32_t size) generates (uint32_t size);
 };
diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 640978f..1c7da4b 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build IExpression.hal
 #
-GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpression.java
+GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpression.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
@@ -38,7 +38,7 @@
 #
 # Build IExpressionExt.hal
 #
-GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpressionExt.java
+GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpressionExt.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal
@@ -75,7 +75,7 @@
 #
 # Build IExpression.hal
 #
-GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpression.java
+GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpression.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
@@ -94,7 +94,7 @@
 #
 # Build IExpressionExt.hal
 #
-GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpressionExt.java
+GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpressionExt.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal
diff --git a/tests/inheritance/1.0/Android.mk b/tests/inheritance/1.0/Android.mk
index 17d2930..8c1b1c8 100644
--- a/tests/inheritance/1.0/Android.mk
+++ b/tests/inheritance/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build IChild.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IChild.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IChild.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IChild.hal
@@ -40,7 +40,7 @@
 #
 # Build IFetcher.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IFetcher.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IFetcher.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFetcher.hal
@@ -65,7 +65,7 @@
 #
 # Build IGrandparent.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IGrandparent.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IGrandparent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGrandparent.hal
@@ -84,7 +84,7 @@
 #
 # Build IParent.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IParent.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IParent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IParent.hal
@@ -121,7 +121,7 @@
 #
 # Build IChild.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IChild.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IChild.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IChild.hal
@@ -142,7 +142,7 @@
 #
 # Build IFetcher.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IFetcher.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IFetcher.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFetcher.hal
@@ -167,7 +167,7 @@
 #
 # Build IGrandparent.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IGrandparent.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IGrandparent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGrandparent.hal
@@ -186,7 +186,7 @@
 #
 # Build IParent.hal
 #
-GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IParent.java
+GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IParent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IParent.hal
diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index 32a4fed..ae873af 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build IBenchmark.hal
 #
-GEN := $(intermediates)/android/hardware/tests/libhwbinder/1.0/IBenchmark.java
+GEN := $(intermediates)/android/hardware/tests/libhwbinder/V1_0/IBenchmark.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
@@ -54,7 +54,7 @@
 #
 # Build IBenchmark.hal
 #
-GEN := $(intermediates)/android/hardware/tests/libhwbinder/1.0/IBenchmark.java
+GEN := $(intermediates)/android/hardware/tests/libhwbinder/V1_0/IBenchmark.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk
index 254a15a..ee7f980 100644
--- a/wifi/1.0/Android.mk
+++ b/wifi/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (IfaceType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IfaceType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IfaceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build types.hal (NanAvailDuration)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanAvailDuration.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanAvailDuration.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@
 #
 # Build types.hal (NanBeaconSdfPayloadInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -76,7 +76,7 @@
 #
 # Build types.hal (NanBeaconSdfPayloadReceive)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadReceive.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadReceive.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -95,7 +95,7 @@
 #
 # Build types.hal (NanBeaconSdfPayloadRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -114,7 +114,7 @@
 #
 # Build types.hal (NanCapabilitiesResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -133,7 +133,7 @@
 #
 # Build types.hal (NanCapabilitiesResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -152,7 +152,7 @@
 #
 # Build types.hal (NanChannelIndex)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanChannelIndex.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanChannelIndex.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -171,7 +171,7 @@
 #
 # Build types.hal (NanConfigRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanConfigRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConfigRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -190,7 +190,7 @@
 #
 # Build types.hal (NanConnectionType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanConnectionType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConnectionType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -209,7 +209,7 @@
 #
 # Build types.hal (NanDataPathAppInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathAppInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathAppInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -228,7 +228,7 @@
 #
 # Build types.hal (NanDataPathCfg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathCfg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathCfg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -247,7 +247,7 @@
 #
 # Build types.hal (NanDataPathChannelCfg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathChannelCfg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathChannelCfg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -266,7 +266,7 @@
 #
 # Build types.hal (NanDataPathConfirmInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathConfirmInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathConfirmInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -285,7 +285,7 @@
 #
 # Build types.hal (NanDataPathEndInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -304,7 +304,7 @@
 #
 # Build types.hal (NanDataPathEndRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -323,7 +323,7 @@
 #
 # Build types.hal (NanDataPathIndicationResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathIndicationResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathIndicationResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -342,7 +342,7 @@
 #
 # Build types.hal (NanDataPathInitiatorRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathInitiatorRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathInitiatorRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -361,7 +361,7 @@
 #
 # Build types.hal (NanDataPathRequestInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathRequestInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathRequestInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -380,7 +380,7 @@
 #
 # Build types.hal (NanDataPathResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -399,7 +399,7 @@
 #
 # Build types.hal (NanDataPathResponseCode)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseCode.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -418,7 +418,7 @@
 #
 # Build types.hal (NanDataPathResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -437,7 +437,7 @@
 #
 # Build types.hal (NanDeviceRole)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDeviceRole.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDeviceRole.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -456,7 +456,7 @@
 #
 # Build types.hal (NanDisabledInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDisabledInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDisabledInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -475,7 +475,7 @@
 #
 # Build types.hal (NanDiscEngEventInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -494,7 +494,7 @@
 #
 # Build types.hal (NanDiscEngEventType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -513,7 +513,7 @@
 #
 # Build types.hal (NanEnableRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanEnableRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanEnableRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -532,7 +532,7 @@
 #
 # Build types.hal (NanFollowupInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanFollowupInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFollowupInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -551,7 +551,7 @@
 #
 # Build types.hal (NanFurtherAvailabilityChannel)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanFurtherAvailabilityChannel.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFurtherAvailabilityChannel.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -570,7 +570,7 @@
 #
 # Build types.hal (NanMatchAlg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchAlg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchAlg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -589,7 +589,7 @@
 #
 # Build types.hal (NanMatchExpiredInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchExpiredInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchExpiredInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -608,7 +608,7 @@
 #
 # Build types.hal (NanMatchInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -627,7 +627,7 @@
 #
 # Build types.hal (NanMaxSize)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMaxSize.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMaxSize.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -646,7 +646,7 @@
 #
 # Build types.hal (NanPublishCancelRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishCancelRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishCancelRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -665,7 +665,7 @@
 #
 # Build types.hal (NanPublishRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -684,7 +684,7 @@
 #
 # Build types.hal (NanPublishResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -703,7 +703,7 @@
 #
 # Build types.hal (NanPublishResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -722,7 +722,7 @@
 #
 # Build types.hal (NanPublishTerminatedInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishTerminatedInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishTerminatedInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -741,7 +741,7 @@
 #
 # Build types.hal (NanPublishType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -760,7 +760,7 @@
 #
 # Build types.hal (NanReceiveVendorSpecificAttribute)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanReceiveVendorSpecificAttribute.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanReceiveVendorSpecificAttribute.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -779,7 +779,7 @@
 #
 # Build types.hal (NanResponseMsgHeader)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseMsgHeader.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseMsgHeader.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -798,7 +798,7 @@
 #
 # Build types.hal (NanResponseType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -817,7 +817,7 @@
 #
 # Build types.hal (NanSocialChannelScanParams)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSocialChannelScanParams.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSocialChannelScanParams.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -836,7 +836,7 @@
 #
 # Build types.hal (NanSrfIncludeType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfIncludeType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfIncludeType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -855,7 +855,7 @@
 #
 # Build types.hal (NanSrfType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -874,7 +874,7 @@
 #
 # Build types.hal (NanStatusType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanStatusType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanStatusType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -893,7 +893,7 @@
 #
 # Build types.hal (NanSubscribeCancelRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeCancelRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeCancelRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -912,7 +912,7 @@
 #
 # Build types.hal (NanSubscribeRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -931,7 +931,7 @@
 #
 # Build types.hal (NanSubscribeResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -950,7 +950,7 @@
 #
 # Build types.hal (NanSubscribeResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -969,7 +969,7 @@
 #
 # Build types.hal (NanSubscribeTerminatedInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeTerminatedInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeTerminatedInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -988,7 +988,7 @@
 #
 # Build types.hal (NanSubscribeType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1007,7 +1007,7 @@
 #
 # Build types.hal (NanTransmitFollowupInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1026,7 +1026,7 @@
 #
 # Build types.hal (NanTransmitFollowupRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1045,7 +1045,7 @@
 #
 # Build types.hal (NanTransmitVendorSpecificAttribute)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitVendorSpecificAttribute.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitVendorSpecificAttribute.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1064,7 +1064,7 @@
 #
 # Build types.hal (NanTransmitWindowType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitWindowType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitWindowType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1083,7 +1083,7 @@
 #
 # Build types.hal (NanTxPriority)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxPriority.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxPriority.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1102,7 +1102,7 @@
 #
 # Build types.hal (NanTxType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1121,7 +1121,7 @@
 #
 # Build types.hal (NanVsaRxFrameMask)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanVsaRxFrameMask.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanVsaRxFrameMask.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1140,7 +1140,7 @@
 #
 # Build types.hal (RttBw)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttBw.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttBw.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1159,7 +1159,7 @@
 #
 # Build types.hal (RttCapabilities)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttCapabilities.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttCapabilities.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1178,7 +1178,7 @@
 #
 # Build types.hal (RttConfig)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttConfig.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttConfig.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1197,7 +1197,7 @@
 #
 # Build types.hal (RttLciInformation)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttLciInformation.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLciInformation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1216,7 +1216,7 @@
 #
 # Build types.hal (RttLcrInformation)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttLcrInformation.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLcrInformation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1235,7 +1235,7 @@
 #
 # Build types.hal (RttMotionPattern)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttMotionPattern.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttMotionPattern.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1254,7 +1254,7 @@
 #
 # Build types.hal (RttPeerType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttPeerType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPeerType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1273,7 +1273,7 @@
 #
 # Build types.hal (RttPreamble)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttPreamble.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPreamble.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1292,7 +1292,7 @@
 #
 # Build types.hal (RttResponder)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttResponder.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResponder.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1311,7 +1311,7 @@
 #
 # Build types.hal (RttResult)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttResult.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1330,7 +1330,7 @@
 #
 # Build types.hal (RttStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttStatus.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1349,7 +1349,7 @@
 #
 # Build types.hal (RttType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1368,7 +1368,7 @@
 #
 # Build types.hal (StaApfPacketFilterCapabilities)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaApfPacketFilterCapabilities.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaApfPacketFilterCapabilities.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1387,7 +1387,7 @@
 #
 # Build types.hal (StaBackgroundScanBand)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBand.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBand.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1406,7 +1406,7 @@
 #
 # Build types.hal (StaBackgroundScanBucketEventReportSchemeMask)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketEventReportSchemeMask.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketEventReportSchemeMask.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1425,7 +1425,7 @@
 #
 # Build types.hal (StaBackgroundScanBucketParameters)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketParameters.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketParameters.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1444,7 +1444,7 @@
 #
 # Build types.hal (StaBackgroundScanCapabilities)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanCapabilities.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanCapabilities.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1463,7 +1463,7 @@
 #
 # Build types.hal (StaBackgroundScanParameters)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanParameters.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanParameters.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1482,7 +1482,7 @@
 #
 # Build types.hal (StaLinkLayerIfacePacketStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfacePacketStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfacePacketStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1501,7 +1501,7 @@
 #
 # Build types.hal (StaLinkLayerIfaceStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfaceStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfaceStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1520,7 +1520,7 @@
 #
 # Build types.hal (StaLinkLayerRadioStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerRadioStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerRadioStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1539,7 +1539,7 @@
 #
 # Build types.hal (StaLinkLayerStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1558,7 +1558,7 @@
 #
 # Build types.hal (StaScanData)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanData.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1577,7 +1577,7 @@
 #
 # Build types.hal (StaScanDataFlagMask)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanDataFlagMask.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanDataFlagMask.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1596,7 +1596,7 @@
 #
 # Build types.hal (StaScanResult)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanResult.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1615,7 +1615,7 @@
 #
 # Build types.hal (WifiChannelInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1634,7 +1634,7 @@
 #
 # Build types.hal (WifiChannelWidthInMhz)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelWidthInMhz.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelWidthInMhz.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1653,7 +1653,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonRxIcmpPacketDetails)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1672,7 +1672,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonRxMulticastPacketDetails)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1691,7 +1691,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonRxPacketDetails)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxPacketDetails.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxPacketDetails.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1710,7 +1710,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1729,7 +1729,7 @@
 #
 # Build types.hal (WifiDebugPacketFateFrameInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1748,7 +1748,7 @@
 #
 # Build types.hal (WifiDebugPacketFateFrameType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1767,7 +1767,7 @@
 #
 # Build types.hal (WifiDebugRingBufferFlags)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferFlags.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferFlags.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1786,7 +1786,7 @@
 #
 # Build types.hal (WifiDebugRingBufferStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferStatus.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1805,7 +1805,7 @@
 #
 # Build types.hal (WifiDebugRingBufferVerboseLevel)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferVerboseLevel.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferVerboseLevel.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1824,7 +1824,7 @@
 #
 # Build types.hal (WifiDebugRingEntryConnectivityEvent)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryConnectivityEvent.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryConnectivityEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1843,7 +1843,7 @@
 #
 # Build types.hal (WifiDebugRingEntryEventTlv)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlv.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlv.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1862,7 +1862,7 @@
 #
 # Build types.hal (WifiDebugRingEntryEventTlvType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlvType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlvType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1881,7 +1881,7 @@
 #
 # Build types.hal (WifiDebugRingEntryEventType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1900,7 +1900,7 @@
 #
 # Build types.hal (WifiDebugRingEntryFlags)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryFlags.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryFlags.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1919,7 +1919,7 @@
 #
 # Build types.hal (WifiDebugRingEntryHeader)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryHeader.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryHeader.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1938,7 +1938,7 @@
 #
 # Build types.hal (WifiDebugRingEntryPowerEvent)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryPowerEvent.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryPowerEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1957,7 +1957,7 @@
 #
 # Build types.hal (WifiDebugRingEntryVendorData)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryVendorData.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryVendorData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1976,7 +1976,7 @@
 #
 # Build types.hal (WifiDebugRingEntryWakelockEvent)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryWakelockEvent.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryWakelockEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -1995,7 +1995,7 @@
 #
 # Build types.hal (WifiDebugRxPacketFate)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFate.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFate.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2014,7 +2014,7 @@
 #
 # Build types.hal (WifiDebugRxPacketFateReport)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFateReport.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFateReport.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2033,7 +2033,7 @@
 #
 # Build types.hal (WifiDebugTxPacketFate)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFate.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFate.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2052,7 +2052,7 @@
 #
 # Build types.hal (WifiDebugTxPacketFateReport)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFateReport.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFateReport.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2071,7 +2071,7 @@
 #
 # Build types.hal (WifiInformationElement)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiInformationElement.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiInformationElement.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2090,7 +2090,7 @@
 #
 # Build types.hal (WifiRateInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2109,7 +2109,7 @@
 #
 # Build types.hal (WifiRateNss)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateNss.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateNss.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2128,7 +2128,7 @@
 #
 # Build types.hal (WifiRatePreamble)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRatePreamble.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRatePreamble.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2147,7 +2147,7 @@
 #
 # Build types.hal (WifiStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatus.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2166,7 +2166,7 @@
 #
 # Build types.hal (WifiStatusCode)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatusCode.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatusCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2185,7 +2185,7 @@
 #
 # Build IWifi.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifi.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifi.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal
@@ -2210,7 +2210,7 @@
 #
 # Build IWifiApIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiApIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiApIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiApIface.hal
@@ -2231,7 +2231,7 @@
 #
 # Build IWifiChip.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChip.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChip.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal
@@ -2266,7 +2266,7 @@
 #
 # Build IWifiChipEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChipEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChipEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChipEventCallback.hal
@@ -2287,7 +2287,7 @@
 #
 # Build IWifiEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiEventCallback.hal
@@ -2308,7 +2308,7 @@
 #
 # Build IWifiIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiIface.hal
@@ -2329,7 +2329,7 @@
 #
 # Build IWifiNanIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIface.hal
@@ -2354,7 +2354,7 @@
 #
 # Build IWifiNanIfaceEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIfaceEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIfaceEventCallback.hal
@@ -2375,7 +2375,7 @@
 #
 # Build IWifiP2pIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiP2pIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiP2pIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiP2pIface.hal
@@ -2396,7 +2396,7 @@
 #
 # Build IWifiRttController.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttController.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttController.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal
@@ -2421,7 +2421,7 @@
 #
 # Build IWifiRttControllerEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttControllerEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttControllerEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttControllerEventCallback.hal
@@ -2442,7 +2442,7 @@
 #
 # Build IWifiStaIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIface.hal
@@ -2467,7 +2467,7 @@
 #
 # Build IWifiStaIfaceEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIfaceEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIfaceEventCallback.hal
@@ -2504,7 +2504,7 @@
 #
 # Build types.hal (IfaceType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IfaceType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IfaceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2523,7 +2523,7 @@
 #
 # Build types.hal (NanAvailDuration)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanAvailDuration.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanAvailDuration.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2542,7 +2542,7 @@
 #
 # Build types.hal (NanBeaconSdfPayloadInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2561,7 +2561,7 @@
 #
 # Build types.hal (NanBeaconSdfPayloadReceive)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadReceive.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadReceive.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2580,7 +2580,7 @@
 #
 # Build types.hal (NanBeaconSdfPayloadRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2599,7 +2599,7 @@
 #
 # Build types.hal (NanCapabilitiesResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2618,7 +2618,7 @@
 #
 # Build types.hal (NanCapabilitiesResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2637,7 +2637,7 @@
 #
 # Build types.hal (NanChannelIndex)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanChannelIndex.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanChannelIndex.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2656,7 +2656,7 @@
 #
 # Build types.hal (NanConfigRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanConfigRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConfigRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2675,7 +2675,7 @@
 #
 # Build types.hal (NanConnectionType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanConnectionType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConnectionType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2694,7 +2694,7 @@
 #
 # Build types.hal (NanDataPathAppInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathAppInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathAppInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2713,7 +2713,7 @@
 #
 # Build types.hal (NanDataPathCfg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathCfg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathCfg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2732,7 +2732,7 @@
 #
 # Build types.hal (NanDataPathChannelCfg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathChannelCfg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathChannelCfg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2751,7 +2751,7 @@
 #
 # Build types.hal (NanDataPathConfirmInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathConfirmInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathConfirmInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2770,7 +2770,7 @@
 #
 # Build types.hal (NanDataPathEndInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2789,7 +2789,7 @@
 #
 # Build types.hal (NanDataPathEndRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2808,7 +2808,7 @@
 #
 # Build types.hal (NanDataPathIndicationResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathIndicationResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathIndicationResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2827,7 +2827,7 @@
 #
 # Build types.hal (NanDataPathInitiatorRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathInitiatorRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathInitiatorRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2846,7 +2846,7 @@
 #
 # Build types.hal (NanDataPathRequestInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathRequestInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathRequestInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2865,7 +2865,7 @@
 #
 # Build types.hal (NanDataPathResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2884,7 +2884,7 @@
 #
 # Build types.hal (NanDataPathResponseCode)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseCode.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2903,7 +2903,7 @@
 #
 # Build types.hal (NanDataPathResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2922,7 +2922,7 @@
 #
 # Build types.hal (NanDeviceRole)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDeviceRole.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDeviceRole.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2941,7 +2941,7 @@
 #
 # Build types.hal (NanDisabledInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDisabledInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDisabledInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2960,7 +2960,7 @@
 #
 # Build types.hal (NanDiscEngEventInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2979,7 +2979,7 @@
 #
 # Build types.hal (NanDiscEngEventType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -2998,7 +2998,7 @@
 #
 # Build types.hal (NanEnableRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanEnableRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanEnableRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3017,7 +3017,7 @@
 #
 # Build types.hal (NanFollowupInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanFollowupInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFollowupInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3036,7 +3036,7 @@
 #
 # Build types.hal (NanFurtherAvailabilityChannel)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanFurtherAvailabilityChannel.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFurtherAvailabilityChannel.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3055,7 +3055,7 @@
 #
 # Build types.hal (NanMatchAlg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchAlg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchAlg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3074,7 +3074,7 @@
 #
 # Build types.hal (NanMatchExpiredInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchExpiredInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchExpiredInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3093,7 +3093,7 @@
 #
 # Build types.hal (NanMatchInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3112,7 +3112,7 @@
 #
 # Build types.hal (NanMaxSize)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanMaxSize.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMaxSize.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3131,7 +3131,7 @@
 #
 # Build types.hal (NanPublishCancelRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishCancelRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishCancelRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3150,7 +3150,7 @@
 #
 # Build types.hal (NanPublishRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3169,7 +3169,7 @@
 #
 # Build types.hal (NanPublishResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3188,7 +3188,7 @@
 #
 # Build types.hal (NanPublishResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3207,7 +3207,7 @@
 #
 # Build types.hal (NanPublishTerminatedInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishTerminatedInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishTerminatedInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3226,7 +3226,7 @@
 #
 # Build types.hal (NanPublishType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3245,7 +3245,7 @@
 #
 # Build types.hal (NanReceiveVendorSpecificAttribute)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanReceiveVendorSpecificAttribute.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanReceiveVendorSpecificAttribute.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3264,7 +3264,7 @@
 #
 # Build types.hal (NanResponseMsgHeader)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseMsgHeader.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseMsgHeader.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3283,7 +3283,7 @@
 #
 # Build types.hal (NanResponseType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3302,7 +3302,7 @@
 #
 # Build types.hal (NanSocialChannelScanParams)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSocialChannelScanParams.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSocialChannelScanParams.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3321,7 +3321,7 @@
 #
 # Build types.hal (NanSrfIncludeType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfIncludeType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfIncludeType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3340,7 +3340,7 @@
 #
 # Build types.hal (NanSrfType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3359,7 +3359,7 @@
 #
 # Build types.hal (NanStatusType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanStatusType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanStatusType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3378,7 +3378,7 @@
 #
 # Build types.hal (NanSubscribeCancelRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeCancelRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeCancelRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3397,7 +3397,7 @@
 #
 # Build types.hal (NanSubscribeRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3416,7 +3416,7 @@
 #
 # Build types.hal (NanSubscribeResponse)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponse.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponse.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3435,7 +3435,7 @@
 #
 # Build types.hal (NanSubscribeResponseMsg)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponseMsg.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponseMsg.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3454,7 +3454,7 @@
 #
 # Build types.hal (NanSubscribeTerminatedInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeTerminatedInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeTerminatedInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3473,7 +3473,7 @@
 #
 # Build types.hal (NanSubscribeType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3492,7 +3492,7 @@
 #
 # Build types.hal (NanTransmitFollowupInd)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupInd.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupInd.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3511,7 +3511,7 @@
 #
 # Build types.hal (NanTransmitFollowupRequest)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupRequest.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupRequest.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3530,7 +3530,7 @@
 #
 # Build types.hal (NanTransmitVendorSpecificAttribute)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitVendorSpecificAttribute.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitVendorSpecificAttribute.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3549,7 +3549,7 @@
 #
 # Build types.hal (NanTransmitWindowType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitWindowType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitWindowType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3568,7 +3568,7 @@
 #
 # Build types.hal (NanTxPriority)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxPriority.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxPriority.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3587,7 +3587,7 @@
 #
 # Build types.hal (NanTxType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3606,7 +3606,7 @@
 #
 # Build types.hal (NanVsaRxFrameMask)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/NanVsaRxFrameMask.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/NanVsaRxFrameMask.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3625,7 +3625,7 @@
 #
 # Build types.hal (RttBw)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttBw.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttBw.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3644,7 +3644,7 @@
 #
 # Build types.hal (RttCapabilities)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttCapabilities.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttCapabilities.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3663,7 +3663,7 @@
 #
 # Build types.hal (RttConfig)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttConfig.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttConfig.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3682,7 +3682,7 @@
 #
 # Build types.hal (RttLciInformation)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttLciInformation.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLciInformation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3701,7 +3701,7 @@
 #
 # Build types.hal (RttLcrInformation)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttLcrInformation.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLcrInformation.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3720,7 +3720,7 @@
 #
 # Build types.hal (RttMotionPattern)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttMotionPattern.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttMotionPattern.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3739,7 +3739,7 @@
 #
 # Build types.hal (RttPeerType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttPeerType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPeerType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3758,7 +3758,7 @@
 #
 # Build types.hal (RttPreamble)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttPreamble.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPreamble.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3777,7 +3777,7 @@
 #
 # Build types.hal (RttResponder)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttResponder.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResponder.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3796,7 +3796,7 @@
 #
 # Build types.hal (RttResult)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttResult.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3815,7 +3815,7 @@
 #
 # Build types.hal (RttStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttStatus.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3834,7 +3834,7 @@
 #
 # Build types.hal (RttType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/RttType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/RttType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3853,7 +3853,7 @@
 #
 # Build types.hal (StaApfPacketFilterCapabilities)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaApfPacketFilterCapabilities.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaApfPacketFilterCapabilities.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3872,7 +3872,7 @@
 #
 # Build types.hal (StaBackgroundScanBand)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBand.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBand.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3891,7 +3891,7 @@
 #
 # Build types.hal (StaBackgroundScanBucketEventReportSchemeMask)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketEventReportSchemeMask.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketEventReportSchemeMask.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3910,7 +3910,7 @@
 #
 # Build types.hal (StaBackgroundScanBucketParameters)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketParameters.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketParameters.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3929,7 +3929,7 @@
 #
 # Build types.hal (StaBackgroundScanCapabilities)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanCapabilities.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanCapabilities.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3948,7 +3948,7 @@
 #
 # Build types.hal (StaBackgroundScanParameters)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanParameters.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanParameters.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3967,7 +3967,7 @@
 #
 # Build types.hal (StaLinkLayerIfacePacketStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfacePacketStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfacePacketStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -3986,7 +3986,7 @@
 #
 # Build types.hal (StaLinkLayerIfaceStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfaceStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfaceStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4005,7 +4005,7 @@
 #
 # Build types.hal (StaLinkLayerRadioStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerRadioStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerRadioStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4024,7 +4024,7 @@
 #
 # Build types.hal (StaLinkLayerStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4043,7 +4043,7 @@
 #
 # Build types.hal (StaScanData)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanData.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4062,7 +4062,7 @@
 #
 # Build types.hal (StaScanDataFlagMask)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanDataFlagMask.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanDataFlagMask.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4081,7 +4081,7 @@
 #
 # Build types.hal (StaScanResult)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanResult.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanResult.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4100,7 +4100,7 @@
 #
 # Build types.hal (WifiChannelInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4119,7 +4119,7 @@
 #
 # Build types.hal (WifiChannelWidthInMhz)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelWidthInMhz.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelWidthInMhz.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4138,7 +4138,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonRxIcmpPacketDetails)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4157,7 +4157,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonRxMulticastPacketDetails)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4176,7 +4176,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonRxPacketDetails)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxPacketDetails.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxPacketDetails.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4195,7 +4195,7 @@
 #
 # Build types.hal (WifiDebugHostWakeReasonStats)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonStats.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonStats.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4214,7 +4214,7 @@
 #
 # Build types.hal (WifiDebugPacketFateFrameInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4233,7 +4233,7 @@
 #
 # Build types.hal (WifiDebugPacketFateFrameType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4252,7 +4252,7 @@
 #
 # Build types.hal (WifiDebugRingBufferFlags)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferFlags.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferFlags.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4271,7 +4271,7 @@
 #
 # Build types.hal (WifiDebugRingBufferStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferStatus.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4290,7 +4290,7 @@
 #
 # Build types.hal (WifiDebugRingBufferVerboseLevel)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferVerboseLevel.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferVerboseLevel.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4309,7 +4309,7 @@
 #
 # Build types.hal (WifiDebugRingEntryConnectivityEvent)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryConnectivityEvent.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryConnectivityEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4328,7 +4328,7 @@
 #
 # Build types.hal (WifiDebugRingEntryEventTlv)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlv.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlv.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4347,7 +4347,7 @@
 #
 # Build types.hal (WifiDebugRingEntryEventTlvType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlvType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlvType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4366,7 +4366,7 @@
 #
 # Build types.hal (WifiDebugRingEntryEventType)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventType.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4385,7 +4385,7 @@
 #
 # Build types.hal (WifiDebugRingEntryFlags)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryFlags.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryFlags.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4404,7 +4404,7 @@
 #
 # Build types.hal (WifiDebugRingEntryHeader)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryHeader.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryHeader.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4423,7 +4423,7 @@
 #
 # Build types.hal (WifiDebugRingEntryPowerEvent)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryPowerEvent.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryPowerEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4442,7 +4442,7 @@
 #
 # Build types.hal (WifiDebugRingEntryVendorData)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryVendorData.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryVendorData.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4461,7 +4461,7 @@
 #
 # Build types.hal (WifiDebugRingEntryWakelockEvent)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryWakelockEvent.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryWakelockEvent.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4480,7 +4480,7 @@
 #
 # Build types.hal (WifiDebugRxPacketFate)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFate.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFate.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4499,7 +4499,7 @@
 #
 # Build types.hal (WifiDebugRxPacketFateReport)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFateReport.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFateReport.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4518,7 +4518,7 @@
 #
 # Build types.hal (WifiDebugTxPacketFate)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFate.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFate.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4537,7 +4537,7 @@
 #
 # Build types.hal (WifiDebugTxPacketFateReport)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFateReport.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFateReport.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4556,7 +4556,7 @@
 #
 # Build types.hal (WifiInformationElement)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiInformationElement.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiInformationElement.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4575,7 +4575,7 @@
 #
 # Build types.hal (WifiRateInfo)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateInfo.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateInfo.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4594,7 +4594,7 @@
 #
 # Build types.hal (WifiRateNss)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateNss.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateNss.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4613,7 +4613,7 @@
 #
 # Build types.hal (WifiRatePreamble)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRatePreamble.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRatePreamble.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4632,7 +4632,7 @@
 #
 # Build types.hal (WifiStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatus.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4651,7 +4651,7 @@
 #
 # Build types.hal (WifiStatusCode)
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatusCode.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatusCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -4670,7 +4670,7 @@
 #
 # Build IWifi.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifi.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifi.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal
@@ -4695,7 +4695,7 @@
 #
 # Build IWifiApIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiApIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiApIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiApIface.hal
@@ -4716,7 +4716,7 @@
 #
 # Build IWifiChip.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChip.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChip.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal
@@ -4751,7 +4751,7 @@
 #
 # Build IWifiChipEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChipEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChipEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChipEventCallback.hal
@@ -4772,7 +4772,7 @@
 #
 # Build IWifiEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiEventCallback.hal
@@ -4793,7 +4793,7 @@
 #
 # Build IWifiIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiIface.hal
@@ -4814,7 +4814,7 @@
 #
 # Build IWifiNanIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIface.hal
@@ -4839,7 +4839,7 @@
 #
 # Build IWifiNanIfaceEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIfaceEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIfaceEventCallback.hal
@@ -4860,7 +4860,7 @@
 #
 # Build IWifiP2pIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiP2pIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiP2pIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiP2pIface.hal
@@ -4881,7 +4881,7 @@
 #
 # Build IWifiRttController.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttController.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttController.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal
@@ -4906,7 +4906,7 @@
 #
 # Build IWifiRttControllerEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttControllerEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttControllerEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttControllerEventCallback.hal
@@ -4927,7 +4927,7 @@
 #
 # Build IWifiStaIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIface.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIface.hal
@@ -4952,7 +4952,7 @@
 #
 # Build IWifiStaIfaceEventCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.java
+GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIfaceEventCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIfaceEventCallback.hal
diff --git a/wifi/1.0/IWifiChip.hal b/wifi/1.0/IWifiChip.hal
index 3c085c3..051a088 100644
--- a/wifi/1.0/IWifiChip.hal
+++ b/wifi/1.0/IWifiChip.hal
@@ -323,13 +323,28 @@
    * @return status WifiStatus of the operation.
    *         Possible status codes:
    *         |WifiStatusCode.SUCCESS|,
-   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
    * @return iface HIDL interface object representing the iface if
    *         it exists, null otherwise.
    */
   getApIface(string ifname) generates (WifiStatus status, IWifiApIface iface);
 
   /**
+   * Removes the AP Iface with the provided ifname.
+   * Any further calls on the corresponding |IWifiApIface| HIDL interface
+   * object must fail.
+   *
+   * @param ifname Name of the iface.
+   * @return status WifiStatus of the operation.
+   *         Possible status codes:
+   *         |WifiStatusCode.SUCCESS|,
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
+   */
+  removeApIface(string ifname) generates (WifiStatus status);
+
+  /**
    * Create a NAN iface on the chip.
    *
    * Depending on the mode the chip is configured in, the interface creation
@@ -368,13 +383,28 @@
    * @return status WifiStatus of the operation.
    *         Possible status codes:
    *         |WifiStatusCode.SUCCESS|,
-   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
    * @return iface HIDL interface object representing the iface if
    *         it exists, null otherwise.
    */
   getNanIface(string ifname) generates (WifiStatus status, IWifiNanIface iface);
 
   /**
+   * Removes the NAN Iface with the provided ifname.
+   * Any further calls on the corresponding |IWifiNanIface| HIDL interface
+   * object must fail.
+   *
+   * @param ifname Name of the iface.
+   * @return status WifiStatus of the operation.
+   *         Possible status codes:
+   *         |WifiStatusCode.SUCCESS|,
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
+   */
+  removeNanIface(string ifname) generates (WifiStatus status);
+
+  /**
    * Create a P2P iface on the chip.
    *
    * Depending on the mode the chip is configured in, the interface creation
@@ -413,13 +443,28 @@
    * @return status WifiStatus of the operation.
    *         Possible status codes:
    *         |WifiStatusCode.SUCCESS|,
-   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
    * @return iface HIDL interface object representing the iface if
    *         it exists, null otherwise.
    */
   getP2pIface(string ifname) generates (WifiStatus status, IWifiP2pIface iface);
 
   /**
+   * Removes the P2P Iface with the provided ifname.
+   * Any further calls on the corresponding |IWifiP2pIface| HIDL interface
+   * object must fail.
+   *
+   * @param ifname Name of the iface.
+   * @return status WifiStatus of the operation.
+   *         Possible status codes:
+   *         |WifiStatusCode.SUCCESS|,
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
+   */
+  removeP2pIface(string ifname) generates (WifiStatus status);
+
+  /**
    * Create an STA iface on the chip.
    *
    * Depending on the mode the chip is configured in, the interface creation
@@ -458,13 +503,28 @@
    * @return status WifiStatus of the operation.
    *         Possible status codes:
    *         |WifiStatusCode.SUCCESS|,
-   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
    * @return iface HIDL interface object representing the iface if
    *         it exists, null otherwise.
    */
   getStaIface(string ifname) generates (WifiStatus status, IWifiStaIface iface);
 
   /**
+   * Removes the STA Iface with the provided ifname.
+   * Any further calls on the corresponding |IWifiStaIface| HIDL interface
+   * object must fail.
+   *
+   * @param ifname Name of the iface.
+   * @return status WifiStatus of the operation.
+   *         Possible status codes:
+   *         |WifiStatusCode.SUCCESS|,
+   *         |WifiStatusCode.ERROR_WIFI_CHIP_INVALID|,
+   *         |WifiStatusCode.ERROR_INVALID_ARGS|
+   */
+  removeStaIface(string ifname) generates (WifiStatus status);
+
+  /**
    * Create a RTTController instance.
    *
    * RTT controller can be either:
diff --git a/wifi/1.0/default/Android.mk b/wifi/1.0/default/Android.mk
index 382d350..f0c78ea 100644
--- a/wifi/1.0/default/Android.mk
+++ b/wifi/1.0/default/Android.mk
@@ -24,6 +24,7 @@
     wifi_ap_iface.cpp \
     wifi_chip.cpp \
     wifi_legacy_hal.cpp \
+    wifi_legacy_hal_stubs.cpp \
     wifi_mode_controller.cpp \
     wifi_nan_iface.cpp \
     wifi_p2p_iface.cpp \
diff --git a/wifi/1.0/default/wifi.cpp b/wifi/1.0/default/wifi.cpp
index 30adcc0..332363d 100644
--- a/wifi/1.0/default/wifi.cpp
+++ b/wifi/1.0/default/wifi.cpp
@@ -165,7 +165,6 @@
 }
 
 WifiStatus Wifi::initializeLegacyHal() {
-  LOG(INFO) << "Initializing legacy HAL";
   legacy_hal::wifi_error legacy_status = legacy_hal_->initialize();
   if (legacy_status != legacy_hal::WIFI_SUCCESS) {
     LOG(ERROR) << "Failed to initialize legacy HAL: "
@@ -176,7 +175,6 @@
 }
 
 WifiStatus Wifi::stopLegacyHalAndDeinitializeModeController() {
-  LOG(INFO) << "Stopping legacy HAL";
   run_state_ = RunState::STOPPING;
   const auto on_complete_callback_ = [&]() {
     if (chip_.get()) {
diff --git a/wifi/1.0/default/wifi_chip.cpp b/wifi/1.0/default/wifi_chip.cpp
index af19491..d70f548 100644
--- a/wifi/1.0/default/wifi_chip.cpp
+++ b/wifi/1.0/default/wifi_chip.cpp
@@ -163,6 +163,15 @@
                          ifname);
 }
 
+Return<void> WifiChip::removeApIface(const hidl_string& ifname,
+                                     removeApIface_cb hidl_status_cb) {
+  return validateAndCall(this,
+                         WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
+                         &WifiChip::removeApIfaceInternal,
+                         hidl_status_cb,
+                         ifname);
+}
+
 Return<void> WifiChip::createNanIface(createNanIface_cb hidl_status_cb) {
   return validateAndCall(this,
                          WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
@@ -186,6 +195,15 @@
                          ifname);
 }
 
+Return<void> WifiChip::removeNanIface(const hidl_string& ifname,
+                                      removeNanIface_cb hidl_status_cb) {
+  return validateAndCall(this,
+                         WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
+                         &WifiChip::removeNanIfaceInternal,
+                         hidl_status_cb,
+                         ifname);
+}
+
 Return<void> WifiChip::createP2pIface(createP2pIface_cb hidl_status_cb) {
   return validateAndCall(this,
                          WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
@@ -209,6 +227,15 @@
                          ifname);
 }
 
+Return<void> WifiChip::removeP2pIface(const hidl_string& ifname,
+                                      removeP2pIface_cb hidl_status_cb) {
+  return validateAndCall(this,
+                         WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
+                         &WifiChip::removeP2pIfaceInternal,
+                         hidl_status_cb,
+                         ifname);
+}
+
 Return<void> WifiChip::createStaIface(createStaIface_cb hidl_status_cb) {
   return validateAndCall(this,
                          WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
@@ -232,6 +259,15 @@
                          ifname);
 }
 
+Return<void> WifiChip::removeStaIface(const hidl_string& ifname,
+                                      removeStaIface_cb hidl_status_cb) {
+  return validateAndCall(this,
+                         WifiStatusCode::ERROR_WIFI_CHIP_INVALID,
+                         &WifiChip::removeStaIfaceInternal,
+                         hidl_status_cb,
+                         ifname);
+}
+
 Return<void> WifiChip::createRttController(
     const sp<IWifiIface>& bound_iface, createRttController_cb hidl_status_cb) {
   return validateAndCall(this,
@@ -483,14 +519,21 @@
 }
 
 std::pair<WifiStatus, sp<IWifiApIface>> WifiChip::getApIfaceInternal(
-    const hidl_string& ifname) {
-  if (!ap_iface_.get() ||
-      (ifname.c_str() != legacy_hal_.lock()->getApIfaceName())) {
+    const std::string& ifname) {
+  if (!ap_iface_.get() || (ifname != legacy_hal_.lock()->getApIfaceName())) {
     return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};
   }
   return {createWifiStatus(WifiStatusCode::SUCCESS), ap_iface_};
 }
 
+WifiStatus WifiChip::removeApIfaceInternal(const std::string& ifname) {
+  if (!ap_iface_.get() || (ifname != legacy_hal_.lock()->getApIfaceName())) {
+    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
+  }
+  invalidateAndClear(ap_iface_);
+  return createWifiStatus(WifiStatusCode::SUCCESS);
+}
+
 std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::createNanIfaceInternal() {
   // Only 1 of NAN or P2P iface can be active at a time.
   if (current_mode_id_ != kStaChipModeId || nan_iface_.get() ||
@@ -512,14 +555,21 @@
 }
 
 std::pair<WifiStatus, sp<IWifiNanIface>> WifiChip::getNanIfaceInternal(
-    const hidl_string& ifname) {
-  if (!nan_iface_.get() ||
-      (ifname.c_str() != legacy_hal_.lock()->getNanIfaceName())) {
+    const std::string& ifname) {
+  if (!nan_iface_.get() || (ifname != legacy_hal_.lock()->getNanIfaceName())) {
     return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};
   }
   return {createWifiStatus(WifiStatusCode::SUCCESS), nan_iface_};
 }
 
+WifiStatus WifiChip::removeNanIfaceInternal(const std::string& ifname) {
+  if (!nan_iface_.get() || (ifname != legacy_hal_.lock()->getNanIfaceName())) {
+    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
+  }
+  invalidateAndClear(nan_iface_);
+  return createWifiStatus(WifiStatusCode::SUCCESS);
+}
+
 std::pair<WifiStatus, sp<IWifiP2pIface>> WifiChip::createP2pIfaceInternal() {
   // Only 1 of NAN or P2P iface can be active at a time.
   if (current_mode_id_ != kStaChipModeId || p2p_iface_.get() ||
@@ -541,14 +591,21 @@
 }
 
 std::pair<WifiStatus, sp<IWifiP2pIface>> WifiChip::getP2pIfaceInternal(
-    const hidl_string& ifname) {
-  if (!p2p_iface_.get() ||
-      (ifname.c_str() != legacy_hal_.lock()->getP2pIfaceName())) {
+    const std::string& ifname) {
+  if (!p2p_iface_.get() || (ifname != legacy_hal_.lock()->getP2pIfaceName())) {
     return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};
   }
   return {createWifiStatus(WifiStatusCode::SUCCESS), p2p_iface_};
 }
 
+WifiStatus WifiChip::removeP2pIfaceInternal(const std::string& ifname) {
+  if (!p2p_iface_.get() || (ifname != legacy_hal_.lock()->getP2pIfaceName())) {
+    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
+  }
+  invalidateAndClear(p2p_iface_);
+  return createWifiStatus(WifiStatusCode::SUCCESS);
+}
+
 std::pair<WifiStatus, sp<IWifiStaIface>> WifiChip::createStaIfaceInternal() {
   if (current_mode_id_ != kStaChipModeId || sta_iface_.get()) {
     return {createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE), {}};
@@ -568,14 +625,21 @@
 }
 
 std::pair<WifiStatus, sp<IWifiStaIface>> WifiChip::getStaIfaceInternal(
-    const hidl_string& ifname) {
-  if (!sta_iface_.get() ||
-      (ifname.c_str() != legacy_hal_.lock()->getStaIfaceName())) {
+    const std::string& ifname) {
+  if (!sta_iface_.get() || (ifname != legacy_hal_.lock()->getStaIfaceName())) {
     return {createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS), nullptr};
   }
   return {createWifiStatus(WifiStatusCode::SUCCESS), sta_iface_};
 }
 
+WifiStatus WifiChip::removeStaIfaceInternal(const std::string& ifname) {
+  if (!sta_iface_.get() || (ifname != legacy_hal_.lock()->getStaIfaceName())) {
+    return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
+  }
+  invalidateAndClear(sta_iface_);
+  return createWifiStatus(WifiStatusCode::SUCCESS);
+}
+
 std::pair<WifiStatus, sp<IWifiRttController>>
 WifiChip::createRttControllerInternal(const sp<IWifiIface>& bound_iface) {
   sp<WifiRttController> rtt = new WifiRttController(bound_iface, legacy_hal_);
diff --git a/wifi/1.0/default/wifi_chip.h b/wifi/1.0/default/wifi_chip.h
index 764445f..5e7a0c3 100644
--- a/wifi/1.0/default/wifi_chip.h
+++ b/wifi/1.0/default/wifi_chip.h
@@ -83,18 +83,26 @@
   Return<void> getApIfaceNames(getApIfaceNames_cb hidl_status_cb) override;
   Return<void> getApIface(const hidl_string& ifname,
                           getApIface_cb hidl_status_cb) override;
+  Return<void> removeApIface(const hidl_string& ifname,
+                             removeApIface_cb hidl_status_cb) override;
   Return<void> createNanIface(createNanIface_cb hidl_status_cb) override;
   Return<void> getNanIfaceNames(getNanIfaceNames_cb hidl_status_cb) override;
   Return<void> getNanIface(const hidl_string& ifname,
                            getNanIface_cb hidl_status_cb) override;
+  Return<void> removeNanIface(const hidl_string& ifname,
+                              removeNanIface_cb hidl_status_cb) override;
   Return<void> createP2pIface(createP2pIface_cb hidl_status_cb) override;
   Return<void> getP2pIfaceNames(getP2pIfaceNames_cb hidl_status_cb) override;
   Return<void> getP2pIface(const hidl_string& ifname,
                            getP2pIface_cb hidl_status_cb) override;
+  Return<void> removeP2pIface(const hidl_string& ifname,
+                              removeP2pIface_cb hidl_status_cb) override;
   Return<void> createStaIface(createStaIface_cb hidl_status_cb) override;
   Return<void> getStaIfaceNames(getStaIfaceNames_cb hidl_status_cb) override;
   Return<void> getStaIface(const hidl_string& ifname,
                            getStaIface_cb hidl_status_cb) override;
+  Return<void> removeStaIface(const hidl_string& ifname,
+                              removeStaIface_cb hidl_status_cb) override;
   Return<void> createRttController(
       const sp<IWifiIface>& bound_iface,
       createRttController_cb hidl_status_cb) override;
@@ -131,19 +139,23 @@
   std::pair<WifiStatus, sp<IWifiApIface>> createApIfaceInternal();
   std::pair<WifiStatus, std::vector<hidl_string>> getApIfaceNamesInternal();
   std::pair<WifiStatus, sp<IWifiApIface>> getApIfaceInternal(
-      const hidl_string& ifname);
+      const std::string& ifname);
+  WifiStatus removeApIfaceInternal(const std::string& ifname);
   std::pair<WifiStatus, sp<IWifiNanIface>> createNanIfaceInternal();
   std::pair<WifiStatus, std::vector<hidl_string>> getNanIfaceNamesInternal();
   std::pair<WifiStatus, sp<IWifiNanIface>> getNanIfaceInternal(
-      const hidl_string& ifname);
+      const std::string& ifname);
+  WifiStatus removeNanIfaceInternal(const std::string& ifname);
   std::pair<WifiStatus, sp<IWifiP2pIface>> createP2pIfaceInternal();
   std::pair<WifiStatus, std::vector<hidl_string>> getP2pIfaceNamesInternal();
   std::pair<WifiStatus, sp<IWifiP2pIface>> getP2pIfaceInternal(
-      const hidl_string& ifname);
+      const std::string& ifname);
+  WifiStatus removeP2pIfaceInternal(const std::string& ifname);
   std::pair<WifiStatus, sp<IWifiStaIface>> createStaIfaceInternal();
   std::pair<WifiStatus, std::vector<hidl_string>> getStaIfaceNamesInternal();
   std::pair<WifiStatus, sp<IWifiStaIface>> getStaIfaceInternal(
-      const hidl_string& ifname);
+      const std::string& ifname);
+  WifiStatus removeStaIfaceInternal(const std::string& ifname);
   std::pair<WifiStatus, sp<IWifiRttController>> createRttControllerInternal(
       const sp<IWifiIface>& bound_iface);
   std::pair<WifiStatus, std::vector<WifiDebugRingBufferStatus>>
diff --git a/wifi/1.0/default/wifi_legacy_hal.cpp b/wifi/1.0/default/wifi_legacy_hal.cpp
index bf61d83..d7a1f15 100644
--- a/wifi/1.0/default/wifi_legacy_hal.cpp
+++ b/wifi/1.0/default/wifi_legacy_hal.cpp
@@ -20,8 +20,7 @@
 #include <cutils/properties.h>
 
 #include "wifi_legacy_hal.h"
-
-using android::wifi_system::InterfaceTool;
+#include "wifi_legacy_hal_stubs.h"
 
 namespace android {
 namespace hardware {
@@ -249,11 +248,17 @@
 WifiLegacyHal::WifiLegacyHal()
     : global_handle_(nullptr),
       wlan_interface_handle_(nullptr),
-      awaiting_event_loop_termination_(false) {}
+      awaiting_event_loop_termination_(false),
+      is_started_(false) {}
 
 wifi_error WifiLegacyHal::initialize() {
+  LOG(DEBUG) << "Initialize legacy HAL";
   // TODO: Add back the HAL Tool if we need to. All we need from the HAL tool
   // for now is this function call which we can directly call.
+  if (!initHalFuncTableWithStubs(&global_func_table_)) {
+    LOG(ERROR) << "Failed to initialize legacy hal function table with stubs";
+    return WIFI_ERROR_UNKNOWN;
+  }
   wifi_error status = init_wifi_vendor_hal_func_table(&global_func_table_);
   if (status != WIFI_SUCCESS) {
     LOG(ERROR) << "Failed to initialize legacy hal function table";
@@ -266,29 +271,39 @@
   // Ensure that we're starting in a good state.
   CHECK(global_func_table_.wifi_initialize && !global_handle_ &&
         !wlan_interface_handle_ && !awaiting_event_loop_termination_);
+  if (is_started_) {
+    LOG(DEBUG) << "Legacy HAL already started";
+    return WIFI_SUCCESS;
+  }
+  LOG(DEBUG) << "Starting legacy HAL";
   if (!iface_tool_.SetWifiUpState(true)) {
     LOG(ERROR) << "Failed to set WiFi interface up";
     return WIFI_ERROR_UNKNOWN;
   }
-  LOG(INFO) << "Starting legacy HAL";
   wifi_error status = global_func_table_.wifi_initialize(&global_handle_);
   if (status != WIFI_SUCCESS || !global_handle_) {
     LOG(ERROR) << "Failed to retrieve global handle";
     return status;
   }
-  event_loop_thread_ = std::thread(&WifiLegacyHal::runEventLoop, this);
+  std::thread(&WifiLegacyHal::runEventLoop, this).detach();
   status = retrieveWlanInterfaceHandle();
   if (status != WIFI_SUCCESS || !wlan_interface_handle_) {
     LOG(ERROR) << "Failed to retrieve wlan interface handle";
     return status;
   }
-  LOG(VERBOSE) << "Legacy HAL start complete";
+  LOG(DEBUG) << "Legacy HAL start complete";
+  is_started_ = true;
   return WIFI_SUCCESS;
 }
 
 wifi_error WifiLegacyHal::stop(
     const std::function<void()>& on_stop_complete_user_callback) {
-  LOG(INFO) << "Stopping legacy HAL";
+  if (!is_started_) {
+    LOG(DEBUG) << "Legacy HAL already stopped";
+    on_stop_complete_user_callback();
+    return WIFI_SUCCESS;
+  }
+  LOG(DEBUG) << "Stopping legacy HAL";
   on_stop_complete_internal_callback = [&](wifi_handle handle) {
     CHECK_EQ(global_handle_, handle) << "Handle mismatch";
     // Invalidate all the internal pointers now that the HAL is
@@ -299,7 +314,8 @@
   };
   awaiting_event_loop_termination_ = true;
   global_func_table_.wifi_cleanup(global_handle_, onStopComplete);
-  LOG(VERBOSE) << "Legacy HAL stop initiated";
+  LOG(DEBUG) << "Legacy HAL stop complete";
+  is_started_ = false;
   return WIFI_SUCCESS;
 }
 
@@ -1030,12 +1046,12 @@
 }
 
 void WifiLegacyHal::runEventLoop() {
-  LOG(VERBOSE) << "Starting legacy HAL event loop";
+  LOG(DEBUG) << "Starting legacy HAL event loop";
   global_func_table_.wifi_event_loop(global_handle_);
   if (!awaiting_event_loop_termination_) {
     LOG(FATAL) << "Legacy HAL event loop terminated, but HAL was not stopping";
   }
-  LOG(VERBOSE) << "Legacy HAL event loop terminated";
+  LOG(DEBUG) << "Legacy HAL event loop terminated";
   awaiting_event_loop_termination_ = false;
 }
 
diff --git a/wifi/1.0/default/wifi_legacy_hal.h b/wifi/1.0/default/wifi_legacy_hal.h
index b68fa50..07bc93a 100644
--- a/wifi/1.0/default/wifi_legacy_hal.h
+++ b/wifi/1.0/default/wifi_legacy_hal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef WIFI_LEGACY_WIFI_HAL_H_
-#define WIFI_LEGACY_WIFI_HAL_H_
+#ifndef WIFI_LEGACY_HAL_H_
+#define WIFI_LEGACY_HAL_H_
 
 #include <functional>
 #include <thread>
@@ -250,8 +250,6 @@
   getGscanCachedResults();
   void invalidate();
 
-  // Event loop thread used by legacy HAL.
-  std::thread event_loop_thread_;
   // Global function table of legacy HAL.
   wifi_hal_fn global_func_table_;
   // Opaque handle to be used for all global operations.
@@ -260,6 +258,8 @@
   wifi_interface_handle wlan_interface_handle_;
   // Flag to indicate if we have initiated the cleanup of legacy HAL.
   bool awaiting_event_loop_termination_;
+  // Flag to indicate if the legacy HAL has been started.
+  bool is_started_;
   wifi_system::InterfaceTool iface_tool_;
 };
 
@@ -270,4 +270,4 @@
 }  // namespace hardware
 }  // namespace android
 
-#endif  // WIFI_LEGACY_WIFI_HAL_H_
+#endif  // WIFI_LEGACY_HAL_H_
diff --git a/wifi/1.0/default/wifi_legacy_hal_stubs.cpp b/wifi/1.0/default/wifi_legacy_hal_stubs.cpp
new file mode 100644
index 0000000..2973430
--- /dev/null
+++ b/wifi/1.0/default/wifi_legacy_hal_stubs.cpp
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "wifi_legacy_hal_stubs.h"
+
+// TODO: Remove these stubs from HalTool in libwifi-system.
+namespace android {
+namespace hardware {
+namespace wifi {
+namespace V1_0 {
+namespace implementation {
+namespace legacy_hal {
+template <typename>
+struct stubFunction;
+
+template <typename R, typename... Args>
+struct stubFunction<R (*)(Args...)> {
+  static constexpr R invoke(Args...) { return WIFI_ERROR_NOT_SUPPORTED; }
+};
+template <typename... Args>
+struct stubFunction<void (*)(Args...)> {
+  static constexpr void invoke(Args...) {}
+};
+
+template <typename T>
+void populateStubFor(T* val) {
+  *val = &stubFunction<T>::invoke;
+}
+
+bool initHalFuncTableWithStubs(wifi_hal_fn* hal_fn) {
+  if (hal_fn == nullptr) {
+    return false;
+  }
+  populateStubFor(&hal_fn->wifi_initialize);
+  populateStubFor(&hal_fn->wifi_cleanup);
+  populateStubFor(&hal_fn->wifi_event_loop);
+  populateStubFor(&hal_fn->wifi_get_error_info);
+  populateStubFor(&hal_fn->wifi_get_supported_feature_set);
+  populateStubFor(&hal_fn->wifi_get_concurrency_matrix);
+  populateStubFor(&hal_fn->wifi_set_scanning_mac_oui);
+  populateStubFor(&hal_fn->wifi_get_supported_channels);
+  populateStubFor(&hal_fn->wifi_is_epr_supported);
+  populateStubFor(&hal_fn->wifi_get_ifaces);
+  populateStubFor(&hal_fn->wifi_get_iface_name);
+  populateStubFor(&hal_fn->wifi_set_iface_event_handler);
+  populateStubFor(&hal_fn->wifi_reset_iface_event_handler);
+  populateStubFor(&hal_fn->wifi_start_gscan);
+  populateStubFor(&hal_fn->wifi_stop_gscan);
+  populateStubFor(&hal_fn->wifi_get_cached_gscan_results);
+  populateStubFor(&hal_fn->wifi_set_bssid_hotlist);
+  populateStubFor(&hal_fn->wifi_reset_bssid_hotlist);
+  populateStubFor(&hal_fn->wifi_set_significant_change_handler);
+  populateStubFor(&hal_fn->wifi_reset_significant_change_handler);
+  populateStubFor(&hal_fn->wifi_get_gscan_capabilities);
+  populateStubFor(&hal_fn->wifi_set_link_stats);
+  populateStubFor(&hal_fn->wifi_get_link_stats);
+  populateStubFor(&hal_fn->wifi_clear_link_stats);
+  populateStubFor(&hal_fn->wifi_get_valid_channels);
+  populateStubFor(&hal_fn->wifi_rtt_range_request);
+  populateStubFor(&hal_fn->wifi_rtt_range_cancel);
+  populateStubFor(&hal_fn->wifi_get_rtt_capabilities);
+  populateStubFor(&hal_fn->wifi_rtt_get_responder_info);
+  populateStubFor(&hal_fn->wifi_enable_responder);
+  populateStubFor(&hal_fn->wifi_disable_responder);
+  populateStubFor(&hal_fn->wifi_set_nodfs_flag);
+  populateStubFor(&hal_fn->wifi_start_logging);
+  populateStubFor(&hal_fn->wifi_set_epno_list);
+  populateStubFor(&hal_fn->wifi_reset_epno_list);
+  populateStubFor(&hal_fn->wifi_set_country_code);
+  populateStubFor(&hal_fn->wifi_get_firmware_memory_dump);
+  populateStubFor(&hal_fn->wifi_set_log_handler);
+  populateStubFor(&hal_fn->wifi_reset_log_handler);
+  populateStubFor(&hal_fn->wifi_set_alert_handler);
+  populateStubFor(&hal_fn->wifi_reset_alert_handler);
+  populateStubFor(&hal_fn->wifi_get_firmware_version);
+  populateStubFor(&hal_fn->wifi_get_ring_buffers_status);
+  populateStubFor(&hal_fn->wifi_get_logger_supported_feature_set);
+  populateStubFor(&hal_fn->wifi_get_ring_data);
+  populateStubFor(&hal_fn->wifi_enable_tdls);
+  populateStubFor(&hal_fn->wifi_disable_tdls);
+  populateStubFor(&hal_fn->wifi_get_tdls_status);
+  populateStubFor(&hal_fn->wifi_get_tdls_capabilities);
+  populateStubFor(&hal_fn->wifi_get_driver_version);
+  populateStubFor(&hal_fn->wifi_set_passpoint_list);
+  populateStubFor(&hal_fn->wifi_reset_passpoint_list);
+  populateStubFor(&hal_fn->wifi_set_lci);
+  populateStubFor(&hal_fn->wifi_set_lcr);
+  populateStubFor(&hal_fn->wifi_start_sending_offloaded_packet);
+  populateStubFor(&hal_fn->wifi_stop_sending_offloaded_packet);
+  populateStubFor(&hal_fn->wifi_start_rssi_monitoring);
+  populateStubFor(&hal_fn->wifi_stop_rssi_monitoring);
+  populateStubFor(&hal_fn->wifi_get_wake_reason_stats);
+  populateStubFor(&hal_fn->wifi_configure_nd_offload);
+  populateStubFor(&hal_fn->wifi_get_driver_memory_dump);
+  populateStubFor(&hal_fn->wifi_start_pkt_fate_monitoring);
+  populateStubFor(&hal_fn->wifi_get_tx_pkt_fates);
+  populateStubFor(&hal_fn->wifi_get_rx_pkt_fates);
+  populateStubFor(&hal_fn->wifi_nan_enable_request);
+  populateStubFor(&hal_fn->wifi_nan_disable_request);
+  populateStubFor(&hal_fn->wifi_nan_publish_request);
+  populateStubFor(&hal_fn->wifi_nan_publish_cancel_request);
+  populateStubFor(&hal_fn->wifi_nan_subscribe_request);
+  populateStubFor(&hal_fn->wifi_nan_subscribe_cancel_request);
+  populateStubFor(&hal_fn->wifi_nan_transmit_followup_request);
+  populateStubFor(&hal_fn->wifi_nan_stats_request);
+  populateStubFor(&hal_fn->wifi_nan_config_request);
+  populateStubFor(&hal_fn->wifi_nan_tca_request);
+  populateStubFor(&hal_fn->wifi_nan_beacon_sdf_payload_request);
+  populateStubFor(&hal_fn->wifi_nan_register_handler);
+  populateStubFor(&hal_fn->wifi_nan_get_version);
+  populateStubFor(&hal_fn->wifi_nan_get_capabilities);
+  populateStubFor(&hal_fn->wifi_nan_data_interface_create);
+  populateStubFor(&hal_fn->wifi_nan_data_interface_delete);
+  populateStubFor(&hal_fn->wifi_nan_data_request_initiator);
+  populateStubFor(&hal_fn->wifi_nan_data_indication_response);
+  populateStubFor(&hal_fn->wifi_nan_data_end);
+  populateStubFor(&hal_fn->wifi_get_packet_filter_capabilities);
+  populateStubFor(&hal_fn->wifi_set_packet_filter);
+  populateStubFor(&hal_fn->wifi_get_roaming_capabilities);
+  populateStubFor(&hal_fn->wifi_enable_firmware_roaming);
+  populateStubFor(&hal_fn->wifi_configure_roaming);
+  return true;
+}
+}  // namespace legacy_hal
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace wifi
+}  // namespace hardware
+}  // namespace android
diff --git a/wifi/1.0/default/wifi_legacy_hal_stubs.h b/wifi/1.0/default/wifi_legacy_hal_stubs.h
new file mode 100644
index 0000000..1cb5f9d
--- /dev/null
+++ b/wifi/1.0/default/wifi_legacy_hal_stubs.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef WIFI_LEGACY_HAL_STUBS_H_
+#define WIFI_LEGACY_HAL_STUBS_H_
+
+namespace android {
+namespace hardware {
+namespace wifi {
+namespace V1_0 {
+namespace implementation {
+namespace legacy_hal {
+#include <hardware_legacy/wifi_hal.h>
+
+bool initHalFuncTableWithStubs(wifi_hal_fn* hal_fn);
+}  // namespace legacy_hal
+}  // namespace implementation
+}  // namespace V1_0
+}  // namespace wifi
+}  // namespace hardware
+}  // namespace android
+
+#endif  // WIFI_LEGACY_HAL_STUBS_H_
diff --git a/wifi/1.0/default/wifi_mode_controller.cpp b/wifi/1.0/default/wifi_mode_controller.cpp
index 42dd9ad..7e82d4c 100644
--- a/wifi/1.0/default/wifi_mode_controller.cpp
+++ b/wifi/1.0/default/wifi_mode_controller.cpp
@@ -64,8 +64,7 @@
     LOG(ERROR) << "Failed to load WiFi driver";
     return false;
   }
-  if (!driver_tool_->IsFirmwareModeChangeNeeded(
-          convertIfaceTypeToFirmwareMode(type))) {
+  if (!driver_tool_->ChangeFirmwareMode(convertIfaceTypeToFirmwareMode(type))) {
     LOG(ERROR) << "Failed to change firmware mode";
     return false;
   }
diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk
index 41669da..02a62b6 100644
--- a/wifi/supplicant/1.0/Android.mk
+++ b/wifi/supplicant/1.0/Android.mk
@@ -19,7 +19,7 @@
 #
 # Build types.hal (IfaceType)
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/IfaceType.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/IfaceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@
 #
 # Build types.hal (SupplicantStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatus.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@
 #
 # Build types.hal (SupplicantStatusCode)
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatusCode.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatusCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -76,7 +76,7 @@
 #
 # Build ISupplicant.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicant.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicant.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
@@ -101,7 +101,7 @@
 #
 # Build ISupplicantCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
@@ -120,7 +120,7 @@
 #
 # Build ISupplicantIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
@@ -143,7 +143,7 @@
 #
 # Build ISupplicantNetwork.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantNetwork.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
@@ -164,7 +164,7 @@
 #
 # Build ISupplicantP2pIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIface.hal
@@ -189,7 +189,7 @@
 #
 # Build ISupplicantP2pIfaceCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIfaceCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal
@@ -210,7 +210,7 @@
 #
 # Build ISupplicantP2pNetwork.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetwork.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetwork.hal
@@ -235,7 +235,7 @@
 #
 # Build ISupplicantP2pNetworkCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetworkCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal
@@ -254,7 +254,7 @@
 #
 # Build ISupplicantStaIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIface.hal
@@ -279,7 +279,7 @@
 #
 # Build ISupplicantStaIfaceCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIfaceCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal
@@ -300,7 +300,7 @@
 #
 # Build ISupplicantStaNetwork.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetwork.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetwork.hal
@@ -325,7 +325,7 @@
 #
 # Build ISupplicantStaNetworkCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetworkCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal
@@ -360,7 +360,7 @@
 #
 # Build types.hal (IfaceType)
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/IfaceType.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/IfaceType.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -379,7 +379,7 @@
 #
 # Build types.hal (SupplicantStatus)
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatus.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatus.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -398,7 +398,7 @@
 #
 # Build types.hal (SupplicantStatusCode)
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatusCode.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatusCode.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -417,7 +417,7 @@
 #
 # Build ISupplicant.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicant.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicant.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
@@ -442,7 +442,7 @@
 #
 # Build ISupplicantCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
@@ -461,7 +461,7 @@
 #
 # Build ISupplicantIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
@@ -484,7 +484,7 @@
 #
 # Build ISupplicantNetwork.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantNetwork.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
@@ -505,7 +505,7 @@
 #
 # Build ISupplicantP2pIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIface.hal
@@ -530,7 +530,7 @@
 #
 # Build ISupplicantP2pIfaceCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIfaceCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal
@@ -551,7 +551,7 @@
 #
 # Build ISupplicantP2pNetwork.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetwork.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetwork.hal
@@ -576,7 +576,7 @@
 #
 # Build ISupplicantP2pNetworkCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetworkCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal
@@ -595,7 +595,7 @@
 #
 # Build ISupplicantStaIface.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIface.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIface.hal
@@ -620,7 +620,7 @@
 #
 # Build ISupplicantStaIfaceCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIfaceCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal
@@ -641,7 +641,7 @@
 #
 # Build ISupplicantStaNetwork.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetwork.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetwork.hal
@@ -666,7 +666,7 @@
 #
 # Build ISupplicantStaNetworkCallback.hal
 #
-GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.java
+GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetworkCallback.java
 $(GEN): $(HIDL)
 $(GEN): PRIVATE_HIDL := $(HIDL)
 $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal
diff --git a/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal b/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
index 4c66eba..8a894a0 100644
--- a/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
@@ -209,6 +209,7 @@
 
   /**
    * Used to indicate a Hotspot 2.0 imminent deauth notice.
+   *
    * @param reasonCode Code to indicate the deauth reason.
    *        Refer to section 3.2.1.2 of the Hotspot 2.0 spec.
    * @param reAuthDelayInSec Delay before reauthenticating.
@@ -217,4 +218,28 @@
   oneway onHs20DeauthImminentNotice(uint32_t reasonCode,
                                     uint32_t reAuthDelayInSec,
                                     string url);
+
+  /**
+   * Used to indicate a disconnect from the currently connected
+   * network on this iface,.
+   *
+   * @param bssid BSSID of the AP from which we disconnected.
+   * @param locallyGenerated If the disconnect was triggered by
+   *        wpa_supplicant.
+   * @param reasonCode 802.11 code to indicate the disconnect reason
+   *        from access point. Refer to section 8.4.1.7 of IEEE802.11 spec.
+   */
+  oneway onDisconnected(
+          Bssid bssid, bool locallyGenerated, uint32_t reasonCode);
+
+  /**
+   * Used to indicate an association rejection recieved from the AP
+   * to which the connection is being attempted.
+   *
+   * @param bssid BSSID of the corresponding AP which sent this
+   *        reject.
+   * @param statusCode 802.11 code to indicate the reject reason.
+   *        Refer to section 8.4.1.9 of IEEE 802.11 spec.
+   */
+  oneway onAssociationRejected(Bssid bssid, uint32_t statusCode);
 };
diff --git a/wifi/supplicant/1.0/ISupplicantStaNetwork.hal b/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
index e414a07..479ba94 100644
--- a/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
@@ -453,7 +453,7 @@
   setEapSubjectMatch(string match) generates (SupplicantStatus status);
 
   /**
-   * Set EAP Altsubject match for this network.
+   * Set EAP Alt subject match for this network.
    *
    * @param match value to set.
    * @return status Status of the operation.
@@ -649,6 +649,184 @@
   getRequirePmf() generates (SupplicantStatus status, bool enabled);
 
   /**
+   * Get EAP Method set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return method value set.
+   *        Must be one of |EapMethod| values.
+   */
+  getEapMethod()
+      generates (SupplicantStatus status, EapMethod method);
+
+  /**
+   * Get EAP Phase2 Method set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return method value set.
+   *        Must be one of |EapPhase2Method| values.
+   */
+  getEapPhase2Method()
+      generates (SupplicantStatus status, EapPhase2Method method);
+
+  /**
+   * Get EAP Identity set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return identity value set.
+   */
+  getEapIdentity()
+      generates (SupplicantStatus status, vec<uint8_t> identity);
+
+  /**
+   * Get EAP Anonymous Identity set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return identity value set.
+   */
+  getEapAnonymousIdentity()
+      generates (SupplicantStatus status, vec<uint8_t> identity);
+
+  /**
+   * Get EAP Password set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return password value set.
+   */
+  getEapPassword()
+      generates (SupplicantStatus status, vec<uint8_t> password);
+
+  /**
+   * Get EAP CA certificate file path set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return path value set.
+   */
+  getEapCACert() generates (SupplicantStatus status, string path);
+
+  /**
+   * Get EAP CA certificate directory path set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return path value set.
+   */
+  getEapCAPath() generates (SupplicantStatus status, string path);
+
+  /**
+   * Get EAP Client certificate file path set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return path value set.
+   */
+  getEapClientCert() generates (SupplicantStatus status, string path);
+
+  /**
+   * Get EAP private key file path set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return path value set.
+   */
+  getEapPrivateKey() generates (SupplicantStatus status, string path);
+
+  /**
+   * Get EAP subject match set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return match value set.
+   */
+  getEapSubjectMatch() generates (SupplicantStatus status, string match);
+
+  /**
+   * Get EAP Alt subject match set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return match value set.
+   */
+  getEapAltSubjectMatch()
+      generates (SupplicantStatus status, string match);
+
+  /**
+   * Get if EAP Open SSL Engine is enabled for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return enabled true if set, false otherwise.
+   */
+  getEapEngine() generates (SupplicantStatus status, bool enabled);
+
+  /**
+   * Get EAP Open SSL Engine ID set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return id value set.
+   */
+  getEapEngineID() generates (SupplicantStatus status, string id);
+
+  /**
+   * Get EAP Domain suffix match set for this network.
+   *
+   * @return status Status of the operation.
+   *         Possible status codes:
+   *         |SupplicantStatusCode.SUCCESS|,
+   *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|,
+   *         |SupplicantStatusCode.FAILURE_UNKNOWN|,
+   *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+   * @return match value set.
+   */
+  getEapDomainSuffixMatch()
+      generates (SupplicantStatus status, string match);
+
+  /**
    * Enable the network for connection purposes.
    *
    * This must trigger a connection to the network if: