diff --git a/generic/private/compat/30.0/30.0.cil b/generic/private/compat/30.0/30.0.cil
index 3dd4c2dd..7421e7f3 100755
--- a/generic/private/compat/30.0/30.0.cil
+++ b/generic/private/compat/30.0/30.0.cil
@@ -1,60 +1,93 @@
 (typeattributeset vendor_persist_camera_prop_30_0 (vendor_persist_camera_prop))
 (expandtypeattribute (vendor_persist_camera_prop_30_0) true)
+(typeattribute vendor_persist_camera_prop_30_0)
 (typeattributeset vendor_usta_app_service_30_0 (vendor_usta_app_service))
 (expandtypeattribute (vendor_usta_app_service_30_0) true)
+(typeattribute vendor_usta_app_service_30_0)
 (typeattributeset vendor_qvrd_30_0 (vendor_qvrd))
 (expandtypeattribute (vendor_qvrd_30_0) true)
+(typeattribute vendor_qvrd_30_0)
 (typeattributeset vendor_qtelephony_30_0 (vendor_qtelephony))
 (expandtypeattribute (vendor_qtelephony_30_0) true)
+(typeattribute vendor_qtelephony_30_0)
 (typeattributeset vendor_qcc_trd_30_0 (vendor_qcc_trd))
 (expandtypeattribute (vendor_qcc_trd_30_0) true)
+(typeattribute vendor_qcc_trd_30_0)
 (typeattributeset vendor_dataservice_app_30_0 (vendor_dataservice_app))
 (expandtypeattribute (vendor_dataservice_app_30_0) true)
+(typeattribute vendor_dataservice_app_30_0)
 (typeattributeset vendor_seempd_30_0 (vendor_seempd))
 (expandtypeattribute (vendor_seempd_30_0) true)
+(typeattribute vendor_seempd_30_0)
 (typeattributeset vendor_qcc_utils_app_30_0 (vendor_qcc_utils_app))
 (expandtypeattribute (vendor_qcc_utils_app_30_0) true)
+(typeattribute vendor_qcc_utils_app_30_0)
 (typeattributeset vendor_dpmtcm_socket_30_0 (vendor_dpmtcm_socket))
 (expandtypeattribute (vendor_dpmtcm_socket_30_0) true)
+(typeattribute vendor_dpmtcm_socket_30_0)
 (typeattributeset vendor_sys_video_prop_30_0 (vendor_sys_video_prop))
 (expandtypeattribute (vendor_sys_video_prop_30_0) true)
+(typeattribute vendor_sys_video_prop_30_0)
 (typeattributeset vendor_qcc_app_30_0 (vendor_qcc_app))
 (expandtypeattribute (vendor_qcc_app_30_0) true)
+(typeattribute vendor_qcc_app_30_0)
 (typeattributeset vendor_wfd_app_30_0 (vendor_wfd_app))
 (expandtypeattribute (vendor_wfd_app_30_0) true)
+(typeattribute vendor_wfd_app_30_0)
+(typeattributeset qti-testscripts_30_0 (qti-testscripts))
+(expandtypeattribute (qti-testscripts_30_0) true)
+(typeattribute qti-testscripts_30_0)
 (typeattributeset vendor_bt_prop_30_0 (vendor_bt_prop))
 (expandtypeattribute (vendor_bt_prop_30_0) true)
+(typeattribute vendor_bt_prop_30_0)
 (typeattributeset vendor_mmi_sys_30_0 (vendor_mmi_sys))
 (expandtypeattribute (vendor_mmi_sys_30_0) true)
+(typeattribute vendor_mmi_sys_30_0)
 (typeattributeset vendor_qspmsvc_30_0 (vendor_qspmsvc))
 (expandtypeattribute (vendor_qspmsvc_30_0) true)
+(typeattribute vendor_qspmsvc_30_0)
 (typeattributeset vendor_dpmd_30_0 (vendor_dpmd))
 (expandtypeattribute (vendor_dpmd_30_0) true)
+(typeattribute vendor_dpmd_30_0)
 (typeattributeset vendor_qccsyshal_hwservice_30_0 (vendor_qccsyshal_hwservice))
 (expandtypeattribute (vendor_qccsyshal_hwservice_30_0) true)
+(typeattribute vendor_qccsyshal_hwservice_30_0)
 (typeattributeset vendor_vpsservice_30_0 (vendor_vpsservice))
 (expandtypeattribute (vendor_vpsservice_30_0) true)
+(typeattribute vendor_vpsservice_30_0)
 (typeattributeset vendor_wfdservice_30_0 (vendor_wfdservice))
 (expandtypeattribute (vendor_wfdservice_30_0) true)
+(typeattribute vendor_wfdservice_30_0)
 (typeattributeset vendor_hal_atfwd_hwservice_30_0 (vendor_hal_atfwd_hwservice))
 (expandtypeattribute (vendor_hal_atfwd_hwservice_30_0) true)
+(typeattribute vendor_hal_atfwd_hwservice_30_0)
 (typeattributeset vendor_smcinvoke_device_30_0 (vendor_smcinvoke_device))
 (expandtypeattribute (vendor_smcinvoke_device_30_0) true)
+(typeattribute vendor_smcinvoke_device_30_0)
 (typeattributeset vendor_persist_dpm_prop_30_0 (vendor_persist_dpm_prop))
 (expandtypeattribute (vendor_persist_dpm_prop_30_0) true)
+(typeattribute vendor_persist_dpm_prop_30_0)
 (typeattributeset vendor_dun-server_30_0 (vendor_dun-server))
 (expandtypeattribute (vendor_dun-server_30_0) true)
+(typeattribute vendor_dun-server_30_0)
 (typeattributeset vendor_wlc_prop_30_0 (vendor_wlc_prop))
 (expandtypeattribute (vendor_wlc_prop_30_0) true)
+(typeattribute vendor_wlc_prop_30_0)
 (typeattributeset vendor_elabel_data_file_30_0 (vendor_elabel_data_file))
 (expandtypeattribute (vendor_elabel_data_file_30_0) true)
+(typeattribute vendor_elabel_data_file_30_0)
 (typeattributeset vendor_fm_app_30_0 (vendor_fm_app))
 (expandtypeattribute (vendor_fm_app_30_0) true)
+(typeattribute vendor_fm_app_30_0)
 (typeattributeset vendor_perfservice_30_0 (vendor_perfservice))
 (expandtypeattribute (vendor_perfservice_30_0) true)
+(typeattribute vendor_perfservice_30_0)
 (typeattributeset vendor_sigmahal_hwservice_30_0 (vendor_sigmahal_hwservice))
 (expandtypeattribute (vendor_sigmahal_hwservice_30_0) true)
+(typeattribute vendor_sigmahal_hwservice_30_0)
 (typeattributeset vendor_location_app_30_0 (vendor_location_app))
 (expandtypeattribute (vendor_location_app_30_0) true)
+(typeattribute vendor_location_app_30_0)
 (typeattributeset vendor_seempdw_socket_30_0 (vendor_seempdw_socket))
 (expandtypeattribute (vendor_seempdw_socket_30_0) true)
+(typeattribute vendor_seempdw_socket_30_0)
diff --git a/generic/product/private/compat/30.0/30.0.cil b/generic/product/private/compat/30.0/30.0.cil
index 13d37860..d2259373 100755
--- a/generic/product/private/compat/30.0/30.0.cil
+++ b/generic/product/private/compat/30.0/30.0.cil
@@ -1,8 +1,12 @@
 (typeattributeset vendor_hal_systemhelper_hwservice_30_0 (vendor_hal_systemhelper_hwservice))
 (expandtypeattribute (vendor_hal_systemhelper_hwservice_30_0) true)
+(typeattribute vendor_hal_systemhelper_hwservice_30_0)
 (typeattributeset vendor_display_notch_prop_30_0 (vendor_display_notch_prop))
 (expandtypeattribute (vendor_display_notch_prop_30_0) true)
+(typeattribute vendor_display_notch_prop_30_0)
 (typeattributeset vendor_systemhelper_app_30_0 (vendor_systemhelper_app))
 (expandtypeattribute (vendor_systemhelper_app_30_0) true)
+(typeattribute vendor_systemhelper_app_30_0)
 (typeattributeset vendor_sys_qti_display_30_0 (vendor_sys_qti_display))
 (expandtypeattribute (vendor_sys_qti_display_30_0) true)
+(typeattribute vendor_sys_qti_display_30_0)